Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
90b1805c by Pier Angelo Vendrame at 2026-03-10T11:08:25+01:00
Bug 41751: Fix the NDK path.
Now the r of the revision is already in var/release.
So, we need to remove it from the build script.
Also, rename the variable to ndk_release since var/release is also used
as an alias of var/channel: release.
- - - - -
3 changed files:
- projects/android-ndk/build
- projects/android-ndk/config
- tools/toolchain-updates/extract-firefox-versions-infos
Changes:
=====================================
projects/android-ndk/build
=====================================
@@ -2,7 +2,7 @@
[% c("var/set_default_env") -%]
unzip -qq $rootdir/[% c("input_files_by_name/ndk")%]
-mv android-ndk-r[% c("var/release") %] [% project %]
+mv android-ndk-[% c("var/ndk_release") %] [% project %]
[% c('tar', {
tar_src => [ project ],
tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
=====================================
projects/android-ndk/config
=====================================
@@ -3,7 +3,7 @@ filename: '[% project %]-[% c("version") %]-[%
c("var/build_id") %].tar.[% c("co
version: 29.0.14206865
var:
- release: r29
+ ndk_release: r29
setup: |
mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
@@ -13,6 +13,6 @@ var:
export
PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
input_files:
- - URL: 'https://dl.google.com/android/repository/android-ndk-[%
c("var/release") %]-linux.zip'
+ - URL: 'https://dl.google.com/android/repository/android-ndk-[%
c("var/ndk_release") %]-linux.zip'
name: ndk
sha256sum: 4abbbcdc842f3d4879206e9695d52709603e52dd68d3c1fff04b3b5e7a308ecf
=====================================
tools/toolchain-updates/extract-firefox-versions-infos
=====================================
@@ -321,7 +321,7 @@ sub get_mozboot_android_info {
bundletool => 'geckoview',
);
my %component_option = (
- ndk => 'var/release',
+ ndk => 'var/ndk_release',
commandlinetools_version_string => 'var/commandlinetools_version_string',
commandlinetools_version => 'var/commandlinetools_version',
bundletool => 'var/bundletool_version',
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/90b1805cbca67aefa3ff5a89b9906bf736a43f58
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/90b1805cbca67aefa3ff5a89b9906bf736a43f58
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
