commit d735870c9767110a84f723ae8371316e01a569da Author: Matthew Finkel <sysrqb@torproject.org> Date: Mon Apr 5 21:38:47 2021 +0000 Bug 40259: Update components for mozilla88-based Fenix (GeckoView part) Now Geckoview uses build-tools 30.0.2, so this patch updates android-toolchain, as well. --- projects/android-toolchain/build | 38 ++++++++++++------------ projects/android-toolchain/config | 36 +++++++++++----------- projects/geckoview/config | 8 ++--- projects/geckoview/list_toolchain_updates_checks | 2 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index e352b67..29d79e5 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -3,9 +3,9 @@ export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk -android_release_dir=android-10 -android_release_dir_old=android-9 -android_release_dir_new=android-11 +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 @@ -26,27 +26,27 @@ done # Tool Archives cd $SDK_HOME unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version") %] -mv $android_release_dir/* build-tools/[% c("version") %] +mkdir -p build-tools/[% c("var/version_30") %] +mv $android_release_dir_11/* 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") %] # 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_old") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version_old") %] -mv $android_release_dir_old/* build-tools/[% c("version_old") %] - -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/* platforms/android-[% c("var/android_api_level") %] +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") %] -unzip -qq $HOME/[% c("input_files_by_name/build_tools_new") %] -d $SDK_HOME -mkdir -p build-tools/[% c("var/android_api_level_new") %] -mv $android_release_dir_new/* build-tools/[% c("var/android_api_level_new") %] +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") %] -unzip -qq $HOME/[% c("input_files_by_name/platform_new") %] -d $SDK_HOME -mkdir -p platforms/android-[% c("var/android_api_level_new") %] -mv $android_release_dir_new/* platforms/android-[% c("var/android_api_level_new") %] +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") %] unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME @@ -56,7 +56,7 @@ mkdir emulator cp tools/emulator emulator/ # Cleanup -rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new +rm -fR $android_release_dir_9 $android_release_dir_10 $android_release_dir_11 # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 6d78b37..5196528 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,8 +1,10 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 29.0.2 -version_old: 28.0.3 +version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]' var: + version_30: 30.0.2 + version_29: 29.0.2 + version_28: 28.0.3 container: use_container: 1 deps: @@ -25,36 +27,36 @@ 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: 29 - android_platform_revision: 04 - android_api_level_new: 30 - android_platform_revision_new: 03 + android_api_level: 30 + android_platform_revision: 03 + android_api_level_29: 29 + android_platform_revision_29: 04 android_ndk_version: 21 android_ndk_revision: d sdk_tools_version: 4333796 input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' name: build_tools + sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_29") %]-linux.zip' + name: build_tools_29 sha256sum: 1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08 - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' - name: build_tools_old + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_28") %]-linux.zip' + name: build_tools_28 sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a + - 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") %]_r[% c("var/android_platform_revision") %].zip' name: platform - sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/android_api_level_new") %]-linux.zip' - name: build_tools_new - sha256sum: ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c - - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_new") %]_r[% c("var/android_platform_revision_new") %].zip' - name: platform_new sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e # ./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. - - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("var/version_30") %]-linux.zip' name: platform_tools - sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 + sha256sum: f7306a7c66d8149c4430aff270d6ed644c720ea29ef799dc613d3dc537485c6e - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 diff --git a/projects/geckoview/config b/projects/geckoview/config index c6286db..d3964dc 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 87.0 + geckoview_version: 88.0b4 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,10 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git + #git_url: https://github.com/mozilla/gecko-dev.git # 88.0b8 - git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf - tag_gpg_id: 0 + #git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf + #tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index ffc5e23..f31fa51 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -44,7 +44,7 @@ if (m/build_tools_version\\s*=\\s*"([^"]+)"/) { } EOF needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") -current='[% pc("android-toolchain", "version") %]' +current='[% pc("android-toolchain", "var/version_30") %]' check_update_needed build_tools "$needed" "$current"