[tbb-commits] [tor-browser-build/master] Bug 40172: Remove gradle 6.3 from android-toolchain

[sysrqb at torproject.org]

commit 503916bba029597f095391c7b777e320a5716348
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Mar 4 19:46:53 2021 +0100

    Bug 40172: Remove gradle 6.3 from android-toolchain
---
 projects/android-toolchain/build  | 2 --
 projects/android-toolchain/config | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index ff132be..aafc584 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -18,8 +18,6 @@ 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
-# application-services is using a comparatively new Gradle, bundle it, too.
-unzip -qq [% c("input_files_by_name/gradle63") %] -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 648b1d9..24a41c2 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -32,7 +32,6 @@ var:
   android_ndk_version: 21
   android_ndk_version_old: 20
   android_ndk_revision: d
-  gradle63: 6.3
   gradle564: 5.6.4
   gradle511: 5.1.1
 input_files:
@@ -61,9 +60,6 @@ input_files:
   - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip'
     name: android_ndk_compiler_old
     sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0
-  - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip
-    name: gradle63
-    sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
   - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip
     name: gradle564
     sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d