[tor-commits] [tor-browser-build/master] Bug 40172: Remove gradle 5.6.4 from android-toolchain
sysrqb at torproject.org
sysrqb at torproject.org
Tue Mar 16 21:50:16 UTC 2021
commit 80b987aebabd8b3a77edf2447ad525f1b2cc81f7
Author: Nicolas Vigier <boklm at torproject.org>
Date: Fri Mar 5 15:35:25 2021 +0100
Bug 40172: Remove gradle 5.6.4 from android-toolchain
---
projects/android-toolchain/build | 4 +---
projects/android-toolchain/config | 13 ++-----------
projects/gradle/config | 1 +
projects/tor-android-service/build | 1 +
projects/tor-android-service/config | 3 +++
projects/tor-onion-proxy-library/build | 1 +
projects/tor-onion-proxy-library/config | 3 +++
7 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index c906776..fa90f64 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -3,19 +3,17 @@
export PROJECT_PATH=/var/tmp/dist/[% project %]
export SDK_HOME=$PROJECT_PATH/android-sdk-linux
export NDK_HOME=$PROJECT_PATH/android-ndk
-export GRADLE_HOME=$PROJECT_PATH/gradle
android_release_dir=android-10
android_release_dir_old=android-9
# Make directories
-mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME
+mkdir -p $NDK_HOME $SDK_HOME
# Compiler Archives
unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME
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
# 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 5d6190b..8ee72a1 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -19,20 +19,14 @@ var:
export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle
export ANDROID_HOME=$ANDROID_SDK_HOME
export GRADLE_USER_HOME=$GRADLE_HOME
- # In the PATH we set $GRADLE_HOME/gradle/bin (not included in
- # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin
- # (which is included in android-toolchain)).
- #
- # Project which need a specific gradle version can use the gradle
- # project and extract it in $GRADLE_HOME/gradle/bin
- export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin
+ export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin
+ mkdir -p "$GRADLE_HOME"
google_repo: https://dl.google.com/android/repository
android_api_level: 29
android_platform_revision: 04
android_ndk_version: 21
android_ndk_version_old: 20
android_ndk_revision: d
- gradle564: 5.6.4
input_files:
- project: container-image
- URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip'
@@ -59,6 +53,3 @@ 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/gradle564") %]-bin.zip
- name: gradle564
- sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
diff --git a/projects/gradle/config b/projects/gradle/config
index 6e2dea1..8e732f5 100644
--- a/projects/gradle/config
+++ b/projects/gradle/config
@@ -9,6 +9,7 @@ var:
- unzip
gradle_sha256sum:
5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a
6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build
index 7efd708..68d63cd 100644
--- a/projects/tor-android-service/build
+++ b/projects/tor-android-service/build
@@ -10,6 +10,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo
mkdir -p /var/tmp/build $output_dir
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
+tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c('version') %]
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
index faeaeb3..171f4a9 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -12,11 +12,14 @@ var:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 5
+ gradle_version: 5.6.4
input_files:
- project: container-image
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
+ - project: gradle
+ name: gradle
- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build
index c9b1e7a..d4950f6 100644
--- a/projects/tor-onion-proxy-library/build
+++ b/projects/tor-onion-proxy-library/build
@@ -12,6 +12,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo
mkdir -p /var/tmp/build $output_dir
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
+tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
# Patch projects
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index d07c37b..f4a5c24 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -14,11 +14,14 @@ var:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 5
+ gradle_version: 5.6.4
input_files:
- project: container-image
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
+ - project: gradle
+ name: gradle
- project: obfs4
name: obfs4-armv7
target_prepend:
More information about the tor-commits
mailing list