[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41751: Fix the NDK path.

Title: GitLab

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:

Changes:

  • projects/android-ndk/build
    ... ... @@ -2,7 +2,7 @@
    2 2 
     [% c("var/set_default_env") -%]
    3 3
    4 4 
     unzip -qq $rootdir/[% c("input_files_by_name/ndk")%]
    5 
    -mv android-ndk-r[% c("var/release") %] [% project %]
    5 
    +mv android-ndk-[% c("var/ndk_release") %] [% project %]
    6 6 
     [% c('tar', {
    7 7 
         tar_src => [ project ],
    8 8 
         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
    3 3 
     version: 29.0.14206865
    4 4
    5 5 
     var:
    6 
    -  release: r29
    6 
    +  ndk_release: r29
    7 7 
       setup: |
    8 8 
         mkdir -p /var/tmp/dist
    9 9 
         tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
    ... ... @@ -13,6 +13,6 @@ var:
    13 13 
         export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
    14 14
    15 15 
     input_files:
    16 
    -  - URL: 'https://dl.google.com/android/repository/android-ndk-[% c("var/release") %]-linux.zip'
    16 
    +  - URL: 'https://dl.google.com/android/repository/android-ndk-[% c("var/ndk_release") %]-linux.zip'
    17 17 
         name: ndk
    18 18 
         sha256sum: 4abbbcdc842f3d4879206e9695d52709603e52dd68d3c1fff04b3b5e7a308ecf

  • tools/toolchain-updates/extract-firefox-versions-infos
    ... ... @@ -321,7 +321,7 @@ sub get_mozboot_android_info {
    321 321 
         bundletool                      => 'geckoview',
    322 322 
       );
    323 323 
       my %component_option = (
    324 
    -    ndk                             => 'var/release',
    324 
    +    ndk                             => 'var/ndk_release',
    325 325 
         commandlinetools_version_string => 'var/commandlinetools_version_string',
    326 326 
         commandlinetools_version        => 'var/commandlinetools_version',
    327 327 
         bundletool                      => 'var/bundletool_version',

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/90b1805cbca67aefa3ff5a89b9906bf736a43f58 at 1773138243 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx