[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40172: Remove gradle 5.1.1 from android-toolchain

sysrqb at torproject.org sysrqb at torproject.org
Tue Apr 6 22:00:09 UTC 2021 

commit e5340d7ef092fe3ad9a98b14bfea526512365606
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Mar 4 20:02:15 2021 +0100

    Bug 40172: Remove gradle 5.1.1 from android-toolchain
---
 projects/android-toolchain/build             | 2 --
 projects/android-toolchain/config            | 4 ----
 projects/geckoview/build                     | 2 ++
 projects/geckoview/config                    | 8 ++++++++
 projects/geckoview/mozconfig-android-aarch64 | 2 +-
 projects/geckoview/mozconfig-android-all     | 2 +-
 projects/geckoview/mozconfig-android-armv7   | 2 +-
 projects/geckoview/mozconfig-android-x86     | 2 +-
 projects/geckoview/mozconfig-android-x86_64  | 2 +-
 projects/gradle/config                       | 1 +
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index aafc584..c906776 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -16,8 +16,6 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME
 # GeckoView is still using an older Android NDK, bundle it, too.
 unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME
 unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME
-# GeckoView is still using an older Gradle, bundle it, too.
-unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME
 
 # NDK Archive
 for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 24a41c2..5d6190b 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -33,7 +33,6 @@ var:
   android_ndk_version_old: 20
   android_ndk_revision: d
   gradle564: 5.6.4
-  gradle511: 5.1.1
 input_files:
   - project: container-image
   - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip'
@@ -63,6 +62,3 @@ input_files:
   - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip
     name: gradle564
     sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
-  - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip
-    name: gradle511
-    sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
diff --git a/projects/geckoview/build b/projects/geckoview/build
index 1c6582c..ab80b81 100644
--- a/projects/geckoview/build
+++ b/projects/geckoview/build
@@ -5,6 +5,8 @@ distdir=/var/tmp/dist
 mkdir -p /var/tmp/build
 mkdir -p $distdir/[% project %]
 
+tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
+
 # We need to have the get-moz-build-date script available in the container
 # but we can't include it via input_files as it is a script shared between
 # projects.
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 2735bc2..f424ff6 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -26,6 +26,7 @@ var:
     use_container: 1
   # this should be updated when the list of gradle dependencies is changed
   gradle_dependencies_version: 6
+  gradle_version: 5.1.1
 
 steps:
   merge_aars:
@@ -40,6 +41,8 @@ steps:
       mkdir -p /var/tmp/build
       mkdir -p $distdir/[% project %]
 
+      tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
+
       cat > get-moz-build-date << "EOF"
       [% INCLUDE "get-moz-build-date" %]
       EOF
@@ -99,6 +102,9 @@ steps:
       - name: '[% c("var/compiler") %]'
         project: '[% c("var/compiler") %]'
         pkg_type: build
+      - project: gradle
+        name: gradle
+        pkg_type: build
       - project: node
         name: node
         pkg_type: build
@@ -141,6 +147,8 @@ input_files:
   - project: container-image
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
+  - project: gradle
+    name: gradle
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - project: binutils
diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64
index 5839477..29be6d2 100644
--- a/projects/geckoview/mozconfig-android-aarch64
+++ b/projects/geckoview/mozconfig-android-aarch64
@@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=aarch64-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle
+ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
 
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
diff --git a/projects/geckoview/mozconfig-android-all b/projects/geckoview/mozconfig-android-all
index 691b1ab..1b41181 100644
--- a/projects/geckoview/mozconfig-android-all
+++ b/projects/geckoview/mozconfig-android-all
@@ -7,4 +7,4 @@ ac_add_options --disable-compile-environment
 ac_add_options --enable-update-channel=beta
 
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle
+ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7
index 2530049..538c515 100644
--- a/projects/geckoview/mozconfig-android-armv7
+++ b/projects/geckoview/mozconfig-android-armv7
@@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle
+ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
 
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86
index 160f95f..d3f8d05 100644
--- a/projects/geckoview/mozconfig-android-x86
+++ b/projects/geckoview/mozconfig-android-x86
@@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle
+ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
 
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64
index 5ca74e3..f2fda06 100644
--- a/projects/geckoview/mozconfig-android-x86_64
+++ b/projects/geckoview/mozconfig-android-x86_64
@@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=x86_64-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle
+ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
 
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
diff --git a/projects/gradle/config b/projects/gradle/config
index 3f0f412..6e2dea1 100644
--- a/projects/gradle/config
+++ b/projects/gradle/config
@@ -8,6 +8,7 @@ var:
   deps:
     - unzip
   gradle_sha256sum:
+    5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
     6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
     6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a
     6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac

More information about the tor-commits mailing list