[tbb-commits] [tor-browser-build/master] Bug 40241: Update components for mozilla87-based Fenix (GeckoView part)
sysrqb at torproject.org
sysrqb at torproject.org
Tue Mar 16 21:50:16 UTC 2021
commit 6ecfe9c5ce9ea4d116d27d76fe5d6545e1d9f294
Author: Nicolas Vigier <boklm at torproject.org>
Date: Wed Mar 3 17:00:27 2021 +0100
Bug 40241: Update components for mozilla87-based Fenix (GeckoView part)
---
projects/android-toolchain/build | 14 +++++---------
projects/android-toolchain/config | 9 ++++-----
projects/application-services/build | 6 ------
projects/geckoview/config | 6 +++---
projects/geckoview/mozconfig-android-aarch64 | 2 +-
projects/geckoview/mozconfig-android-armv7 | 2 +-
projects/geckoview/mozconfig-android-x86 | 2 +-
projects/geckoview/mozconfig-android-x86_64 | 2 +-
projects/nss/build | 8 --------
projects/rust/config | 4 ++--
projects/sqlcipher/build | 8 --------
11 files changed, 18 insertions(+), 45 deletions(-)
diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index fa90f64..bf93bdb 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -12,18 +12,14 @@ 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
# NDK Archive
-for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do
- # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross
- # compilation prefix and the one for all the other tools differ. Let's fix that
- # so we only have to take care of one. See: #33557 (comment 2674649).
- cd $NDK_HOME/android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin
- for f in `ls arm-linux-androideabi-*`; do
+# Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross
+# compilation prefix and the one for all the other tools differ. Let's fix that
+# so we only have to take care of one. See: #33557 (comment 2674649).
+cd $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]/toolchains/llvm/prebuilt/linux-x86_64/bin
+for f in `ls arm-linux-androideabi-*`; do
ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi}
- done
done
# Tool Archives
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 8ee72a1..dc6c3ac 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -15,7 +15,10 @@ var:
# By default we use the old NDK which is the one GeckoView is using.
# However, we can overwrite that per project if needed (e.g.
# application-services is currently on a newer NDK).
- export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %]
+ export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]
+ export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
+ export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %]
+ export NDK_HOST_TAG=linux-x86_64
export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle
export ANDROID_HOME=$ANDROID_SDK_HOME
export GRADLE_USER_HOME=$GRADLE_HOME
@@ -25,7 +28,6 @@ var:
android_api_level: 29
android_platform_revision: 04
android_ndk_version: 21
- android_ndk_version_old: 20
android_ndk_revision: d
input_files:
- project: container-image
@@ -50,6 +52,3 @@ input_files:
- 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
- - 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
diff --git a/projects/application-services/build b/projects/application-services/build
index 24a66f8..4d1ab07 100644
--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -19,12 +19,6 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %]
export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH
cd $rootdir
-# application-services uses a newer NDK, 21, than everything else...
-export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r[% pc('android-toolchain', 'var/android_ndk_version') %][% pc('android-toolchain', 'var/android_ndk_revision') %]
-# We need to add the new path to our build tools to PATH.
-export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
-export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
-export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %]
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
[% IF !c('var/fetch_gradle_dependencies') %]
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 0b0416a..f954ed6 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,14 +1,14 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
git_submodule: 1
gpg_keyring: torbutton.gpg
var:
- geckoview_version: 86.0
+ geckoview_version: 87.0b4
torbrowser_branch: 10.5
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
@@ -140,7 +140,7 @@ steps:
targets:
nightly:
- git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2'
+ git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0
input_files:
diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64
index 696359f..4762a10 100644
--- a/projects/geckoview/mozconfig-android-aarch64
+++ b/projects/geckoview/mozconfig-android-aarch64
@@ -12,7 +12,7 @@ ac_add_options --enable-official-branding
ac_add_options --enable-application=mobile/android
ac_add_options --target=aarch64-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
+ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d
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
diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7
index 344d6a1..5fdcffc 100644
--- a/projects/geckoview/mozconfig-android-armv7
+++ b/projects/geckoview/mozconfig-android-armv7
@@ -12,7 +12,7 @@ ac_add_options --enable-official-branding
ac_add_options --enable-application=mobile/android
ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
+ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d
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
diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86
index e8899a3..294484c 100644
--- a/projects/geckoview/mozconfig-android-x86
+++ b/projects/geckoview/mozconfig-android-x86
@@ -12,7 +12,7 @@ ac_add_options --enable-official-branding
ac_add_options --enable-application=mobile/android
ac_add_options --target=i686-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
+ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d
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
diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64
index cc9e7d1..391b0a5 100644
--- a/projects/geckoview/mozconfig-android-x86_64
+++ b/projects/geckoview/mozconfig-android-x86_64
@@ -12,7 +12,7 @@ ac_add_options --enable-official-branding
ac_add_options --enable-application=mobile/android
ac_add_options --target=x86_64-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20
+ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d
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
diff --git a/projects/nss/build b/projects/nss/build
index c5cfd95..786eec4 100644
--- a/projects/nss/build
+++ b/projects/nss/build
@@ -7,14 +7,6 @@ mkdir /var/tmp/build
tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]
export PATH=/var/tmp/dist/ninja:$PATH
-# application-services uses a newer NDK, 21d, than all the other projects...
-export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %]
-export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION
-# We need to add the new path to our build tools to PATH
-export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
-export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
-export NDK_HOST_TAG=linux-x86_64
-
nspr_64=""
[% IF c("var/cross_prefix") == "armv7a-linux-androideabi" -%]
gyp_arch="arm"
diff --git a/projects/rust/config b/projects/rust/config
index ba820b9..0095a8a 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -11,8 +11,8 @@ var:
targets:
android:
var:
- current_version: 1.49.0
- previous_version: 1.48.0
+ current_version: 1.50.0
+ previous_version: 1.49.0
arch_deps:
- libssl-dev
- pkg-config
diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build
index 8942e57..a9609d6 100644
--- a/projects/sqlcipher/build
+++ b/projects/sqlcipher/build
@@ -6,14 +6,6 @@ builddir=/var/tmp/build/[% project %]
mkdir /var/tmp/build
tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %]
-# application-services uses a newer NDK, 21d, than all the other projects...
-export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %]
-export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION
-# We need to add the new path to our build tools to PATH
-export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
-export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
-export NDK_HOST_TAG=linux-x86_64
-
export AR="[% c('var/cross_prefix') %]-ar"
# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird.
export CC="[% c('var/cross_prefix') %][% pc('android-toolchain', 'var/android_ndk_version') %]-clang"
More information about the tbb-commits
mailing list