Bug 40446: Update components for mozilla99: geckoview part

Partially fixes also #40433, as it bumps Clang to version 13.0.1. However, we may want to see if we can compile compiler-rt with the Clang that we compile, instead of using the NDK's compiler.

Bug 40446: Update components for mozilla99: geckoview part
35ac70b0 · Pier Angelo Vendrame · b74ca3ad · 35ac70b0 · 35ac70b0 · 35ac70b0
Verified Commit 35ac70b0 authored Mar 22, 2022 by Pier Angelo Vendrame
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -27,8 +27,8 @@ done
 # Tool Archives
 cd $SDK_HOME
 unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
-mkdir -p build-tools/[% c("var/version_30") %]
+mkdir -p build-tools/[% c("var/version_31") %]
-mv [% c("var/android_release_dir_30") %]/* build-tools/[% c("var/version_30") %]
+mv [% c("var/android_release_dir") %]/* build-tools/[% c("var/version_31") %]
 unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
 mkdir -p platforms/android-[% c("var/android_api_level") %]

--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]'
+version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]+[% c("var/version_31") %]'
 var:
+  version_31: 31.0.0
  version_30: 30.0.2
  version_29: 29.0.2
  version_28: 28.0.3
@@ -44,12 +45,15 @@ var:
  # but it seems sdk-tools is still being used in the build, so we can't
  # remove sdk-tools yet.
  sdk_tools_version: 4333796
-  commandlinetools_version: 7302050
+  commandlinetools_version: 7583922
-  commandlinetools_version_string: 4.0
+  commandlinetools_version_string: 5.0
 input_files:
  - project: container-image
-  - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip'
+  - URL: '[% c("var/google_repo") %]/build-tools_r31-linux.zip'
    name: build_tools
+    sha256sum: f90c22f5562638a2e00762e1711eebd55e7f0a05232b65200d387307d057bfe8
+  - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip'
+    name: build_tools_30
    sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4
  - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_29") %]-linux.zip'
    name: build_tools_29
@@ -77,7 +81,7 @@ input_files:
    sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
  - URL: '[% c("var/google_repo") %]/commandlinetools-linux-[% c("var/commandlinetools_version") %]_latest.zip'
    name: android_commandlinetools
-    sha256sum: 7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
+    sha256sum: 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
  - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip'
    name: android_ndk_compiler
    sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd
--- a/projects/geckoview/build
+++ b/projects/geckoview/build
@@ -35,7 +35,7 @@ then
    exit 1
 fi
-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
 gradle_repo=/var/tmp/dist/gradle-dependencies
 export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"
 export GRADLE_FLAGS="--no-daemon --offline"
@@ -55,9 +55,8 @@ mkdir "$HOME/.mozbuild"
 ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries
 ./mach build --verbose
-# We don't want to have the debug .aar but the one that has `$channel`, `$arch`,
+# We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name.
-# and `$version` in its name.
+find obj-* -type f -name geckoview*omni*.aar -exec cp {} $distdir/[% project %] \;
-find obj-* -type f -name geckoview-*-*-*.aar -exec cp {} $distdir/[% project %] \;
 cd $distdir
 [% c('tar', {

--- a/projects/geckoview/config
+++ b/projects/geckoview/config
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 var:
-  geckoview_version: 96.0
+  geckoview_version: 99.0b3
  torbrowser_branch: 11.5
  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
  deps:
@@ -20,11 +20,13 @@ var:
    - python3
    - python3-distutils
    - pkg-config
+    - openjdk-11-jdk-headless
  container:
    use_container: 1
  # this should be updated when the list of gradle dependencies is changed
-  gradle_dependencies_version: 9
+  # see doc/how-to-create-gradle-dependencies-list.txt
-  gradle_version: 6.9.1
+  gradle_dependencies_version: 10
+  gradle_version: 7.3
 steps:
  merge_aars:
@@ -72,7 +74,7 @@ steps:
          exit 1
      fi
-      export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+      export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
      gradle_repo=/var/tmp/dist/gradle-dependencies
      export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"
      export GRADLE_FLAGS="--no-daemon --offline"
@@ -86,7 +88,7 @@ steps:
      # We still need to specify --tor-browser-version due to bug 34005.
      ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries
      ./mach build --verbose
-      find obj-* -regex '.*geckoview.*[0-9].\(aar\|pom\)' -exec cp {} $distdir/[% project %] \;
+      find obj-* -regex '.*geckoview.*omni.*\(aar\|pom\)' -exec cp {} $distdir/[% project %] \;
      cd $distdir/
      [% c('tar', {
@@ -144,7 +146,7 @@ steps:
 targets:
  nightly:
-    git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1'
+    git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2'
    tag_gpg_id: 0
 input_files:

--- a/projects/geckoview/gradle-dependencies-list.txt
+++ b/projects/geckoview/gradle-dependencies-list.txt
--- 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", "var/version_30") %]'
+current='[% pc("android-toolchain", "var/version_31") %]'
 check_update_needed build_tools "$needed" "$current"
@@ -165,12 +165,14 @@ check_update_needed nasm "$needed" "$current"
 read -d '' p << 'EOF' || true
 my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml');
 my $clang_toolchain;
-foreach my $t (keys %$d) {
+TOOLCHAIN: foreach my $t (keys %$d) {
-  if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-clang-android-cross') {
+  foreach my $alias (@{$d->{$t}{run}{'toolchain-alias'}}) {
+    if ($alias eq 'linux64-clang') {
      foreach my $fetch (@{$d->{$t}{fetches}{toolchain}}) {
        $clang_toolchain = $fetch if $fetch =~ m/^.*-clang-.*/;
      }
-    last;
+      last TOOLCHAIN;
+    }
  }
 }

--- a/projects/geckoview/mozconfig-android-aarch64
+++ b/projects/geckoview/mozconfig-android-aarch64
@@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
+ac_add_options --enable-minify=properties
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
 ac_add_options --disable-tor-browser-update
 ac_add_options --disable-verify-mar
-# We only use beta GeckoView for now
+# We only use beta GeckoView for now; use default for local builds
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-strip

--- a/projects/geckoview/mozconfig-android-armv7
+++ b/projects/geckoview/mozconfig-android-armv7
@@ -4,7 +4,7 @@ export MOZILLA_OFFICIAL=1
 CC="clang"
 CXX="clang++"
-ac_add_options --with-android-min-sdk=16
+ac_add_options --with-android-min-sdk=21
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
@@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
+ac_add_options --enable-minify=properties
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
 ac_add_options --disable-tor-browser-update
 ac_add_options --disable-verify-mar
-# We only use beta GeckoView for now
+# We only use beta GeckoView for now; use default for local builds
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-strip

--- a/projects/geckoview/mozconfig-android-x86
+++ b/projects/geckoview/mozconfig-android-x86
@@ -4,7 +4,7 @@ export MOZILLA_OFFICIAL=1
 CC="clang"
 CXX="clang++"
-ac_add_options --with-android-min-sdk=16
+ac_add_options --with-android-min-sdk=21
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
@@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
+ac_add_options --enable-minify=properties
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
 ac_add_options --disable-tor-browser-update
 ac_add_options --disable-verify-mar
-# We only use beta GeckoView for now
+# We only use beta GeckoView for now; use default for local builds
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-strip

--- a/projects/geckoview/mozconfig-android-x86_64
+++ b/projects/geckoview/mozconfig-android-x86_64
@@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
+ac_add_options --enable-minify=properties
 # We do not use Tor Launcher on Android:
 ac_add_options --disable-tor-launcher
 ac_add_options --disable-tor-browser-update
 ac_add_options --disable-verify-mar
-# We only use beta GeckoView for now
+# We only use beta GeckoView for now; use default for local builds
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-strip

--- a/projects/gradle/config
+++ b/projects/gradle/config
@@ -16,6 +16,7 @@ var:
    6.7.1: 3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
    6.9.1: 8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe
    7.0.2: 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+    7.3: de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
 input_files:
  - project: container-image

--- a/projects/llvm-project/config
+++ b/projects/llvm-project/config
@@ -4,17 +4,7 @@ git_hash: d28af7c654d8db0b68c175db5ce212d74fb5e9bc
 git_url: https://github.com/llvm/llvm-project
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-# TODO (aguestuser|2022-02-10):
+targets:
-# - we want to use version 13.0.0 for android builds
+  android:
-# - BUT: we are unable to build geckoview v96.0.x if we do so, b/c `clang_rt` errors
+    version: 13.0.1
-#   as per: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/405#note_2776669
+    git_hash: 75e33f71c2dae584b13a7d1186ae0a038ba98838
-# - for now, we revert to 12.0.0 for nightly, but plan to resolve issues using 13.0.0
-#   before tagging next alpha release (11.5a5)
-########################
-# use this later! ----v
-########################
-# targets:
-#   android:
-#     version: 13.0.0
-#     git_hash: d7b669b3a30345cfcdb2fde2af6f48aa4b94845d
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -11,8 +11,8 @@ var:
 targets:
  android:
    var:
-      current_version: 1.56.0
+      current_version: 1.59.0
-      previous_version: 1.55.0
+      previous_version: 1.58.1
      arch_deps:
        - libssl-dev
        - pkg-config

--- a/rbm.conf
+++ b/rbm.conf
@@ -307,10 +307,9 @@ targets:
      android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
      CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
      CXX: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
-      # API 16 is the minimum we currently support for 32 bit on Android
+      # API 21 is the minimum we currently support on Android
-      android_min_api_armv7: 16
+      android_min_api_armv7: 21
-      android_min_api_x86: 16
+      android_min_api_x86: 21
-      # API 21 is the minimum we currently support for 64 bit on Android
      android_min_api_x86_64: 21
      android_min_api_aarch64: 21
      container: