[tor-commits] [tor-browser-build/master] Bug 28752: Don't download tor-android-binary resources during build

[gk at torproject.org]

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634
Author: sisbell <shane.isbell at gmail.com>
Date:   Sun Dec 16 12:57:25 2018 -0800

    Bug 28752: Don't download tor-android-binary resources during build
---
 projects/firefox/build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index da82862..b9d9d5a 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
 
 [% IF c("var/android") %]
   export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies"
+  gradle_repo=/var/tmp/gradle-dependencies
   # Move Gradle Repo to hard-coded location. This location is embedded in the file
   # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility
-  mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies
+  mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
+  # The download script assumes the artifact package name is the complete URL path.
+  # In some cases this is incorrect, so copy those artifacts to the correct location
+  cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo
+  # Move orbot files so they will be included in the apk during the build
   cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app
   # Prepare building the multi-locale .apk
   mkdir -p /var/tmp/dist/locales