[tbb-commits] [tor-browser-build/master] Bug 40385: Add android platform-31_r01

[sysrqb at torproject.org]

commit d0f30e3d203365e4279f8d1f89205c570f6c5a9e
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 25 13:39:18 2021 +0100

    Bug 40385: Add android platform-31_r01
---
 projects/android-toolchain/build  | 20 +++++++++-----------
 projects/android-toolchain/config | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index 6fa7794..ab47fb3 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -3,9 +3,6 @@
 export PROJECT_PATH=/var/tmp/dist/[% project %]
 export SDK_HOME=$PROJECT_PATH/android-sdk-linux
 export NDK_HOME=$SDK_HOME/ndk
-android_release_dir_9=android-9
-android_release_dir_10=android-10
-android_release_dir_11=android-11
 
 # Make directories
 mkdir -p $NDK_HOME $SDK_HOME
@@ -31,26 +28,30 @@ done
 cd $SDK_HOME
 unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
 mkdir -p build-tools/[% c("var/version_30") %]
-mv $android_release_dir_11/* build-tools/[% c("var/version_30") %]
+mv [% c("var/android_release_dir_30") %]/* build-tools/[% c("var/version_30") %]
 
 unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
 mkdir -p platforms/android-[% c("var/android_api_level") %]
-mv $android_release_dir_11/* platforms/android-[% c("var/android_api_level") %]
+mv [% c("var/android_release_dir") %]/* platforms/android-[% c("var/android_api_level") %]
 
 # Apart from GeckoView all other projects do still need build-tools 28.0.3 as
 # they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying
 # `buildToolsVersion`.
 unzip -qq $HOME/[% c("input_files_by_name/build_tools_28") %] -d $SDK_HOME
 mkdir -p build-tools/[% c("var/version_28") %]
-mv $android_release_dir_9/* build-tools/[% c("var/version_28") %]
+mv [% c("var/android_release_dir_28") %]/* build-tools/[% c("var/version_28") %]
 
 unzip -qq $HOME/[% c("input_files_by_name/build_tools_29") %] -d $SDK_HOME
 mkdir -p build-tools/[% c("var/version_29") %]
-mv $android_release_dir_10/* build-tools/[% c("var/version_29") %]
+mv [% c("var/android_release_dir_29") %]/* build-tools/[% c("var/version_29") %]
+
+unzip -qq $HOME/[% c("input_files_by_name/platform_30") %] -d $SDK_HOME
+mkdir -p platforms/android-[% c("var/android_api_level_30") %]
+mv [% c("var/android_release_dir_30") %]/* platforms/android-[% c("var/android_api_level_30") %]
 
 unzip -qq $HOME/[% c("input_files_by_name/platform_29") %] -d $SDK_HOME
 mkdir -p platforms/android-[% c("var/android_api_level_29") %]
-mv $android_release_dir_10/* platforms/android-[% c("var/android_api_level_29") %]
+mv [% c("var/android_release_dir_29") %]/* platforms/android-[% c("var/android_api_level_29") %]
 
 unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
 
@@ -59,9 +60,6 @@ unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
 mkdir emulator
 cp tools/emulator emulator/
 
-# Cleanup
-rm -fR $android_release_dir_9 $android_release_dir_10 $android_release_dir_11
-
 # Archive dist directory
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 47108de..a964f7d 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -26,10 +26,16 @@ var:
     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: 30
-  android_platform_revision: 03
+  android_api_level: 31
+  android_platform_revision: 01
+  android_release_dir: android-12
+  android_api_level_30: 30
+  android_platform_revision_30: 03
+  android_release_dir_30: android-11
   android_api_level_29: 29
   android_platform_revision_29: 04
+  android_release_dir_29: android-10
+  android_release_dir_28: android-9
   android_ndk_version: 21
   android_ndk_revision: d
   android_ndk_version_build: 21.3.6528147
@@ -54,9 +60,12 @@ input_files:
   - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_29") %]_r[% c("var/android_platform_revision_29") %].zip'
     name: platform_29
     sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69
+  - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_30") %]_r[% c("var/android_platform_revision_30") %].zip'
+    name: platform_30
+    sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e
   - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip'
     name: platform
-    sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e
+    sha256sum: 1d69fe1d7f9788d82ff3a374faf4f6ccc9d1d372aa84a86b5bcfb517523b0b3f
   # ./mach bootstrap is fetching the latest version, so it does not seem to
   # matter which particular version we are using. Pin to the one fitting best to
   # SDK version/build-tools version.