[tor-browser-build/master] Bug 31173: Update android-toolchain project to match firefox

29 Aug 2019

commit 576c12b5e461df957731a7d4583d84a8e716ddaf
Author: sisbell <shane.isbell@gmail.com>
Date:   Wed Jul 17 01:48:43 2019 -0700

    Bug 31173: Update android-toolchain project to match firefox
---
 projects/android-toolchain/build  | 21 +++++++++++----------
 projects/android-toolchain/config | 28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index e0f59a9..42e961c 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -15,28 +15,29 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME
 
 # NDK Archive
 cd $NDK_HOME
-mv android-ndk-r15c/* .
-rm -fR android-ndk-r15c
+mv android-ndk-r17b/* .
+rm -fR android-ndk-r17b
 
+# The architectures we support
 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm
 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86
 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64
 
 # Tool Archives
 cd $SDK_HOME
-unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME
-mkdir -p build-tools/26.0.2
-mv android-8.1.0/* build-tools/26.0.2
+unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
+mkdir -p build-tools/27.0.3
+mv android-8.1.0/* build-tools/27.0.3
 
-unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME
-mkdir -p platforms/android-26
-mv android-8.0.0/* platforms/android-26
+unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
+mkdir -p platforms/android-28
+mv android-9/* platforms/android-28
 
-unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME
+unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
 
 # Cleanup
 rm -fR android-8.1.0
-rm -fR android-8.0.0
+rm -fR android-9
 
 # Archive dist directory
 cd /var/tmp/dist
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 8a4c413..8c9c822 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 26.0.2
+version: 27.0.3
 var:
   container:
     use_container: 1
@@ -18,21 +18,21 @@ var:
   google_repo: https://dl.google.com/android/repository
 input_files:
   - project: container-image
-  - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip'
-    name: build_tools_26
-    sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce
-  - URL: '[% c("var/google_repo") %]/platform-26_r02.zip'
-    name: platform_26
-    sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a
-  - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip'
-    name: platform_tools_26
-    sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519
+  - URL: '[% c("var/google_repo") %]/build-tools_r27.0.3-linux.zip'
+    name: build_tools
+    sha256sum: 5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97
+  - URL: '[% c("var/google_repo") %]/platform-28_r04.zip'
+    name: platform
+    sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded
+  - URL: '[% c("var/google_repo") %]/platform-tools_r28.0.3-linux.zip'
+    name: platform_tools
+    sha256sum: 38fccfe8d2646dd12bdd7cad22fedba0493425b98ebd6d620e4c670b9af4c53f
   - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip'
     name: android_sdk_tools
     sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-  - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip'
+  - URL: '[% c("var/google_repo") %]/android-ndk-r17b-linux-x86_64.zip'
     name: android_ndk_compiler
-    sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c
-  - URL: https://services.gradle.org/distributions/gradle-4.1-bin.zip
+    sha256sum: 5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
+  - URL: https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
     name: gradle_bin
-    sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43
+    sha256sum: b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29

    

gk＠torproject.org

tags

participants (1)