[tbb-commits] [tor-browser-build/master] Bug 40373: Add android_ndk_version_build symlink

[sysrqb at torproject.org]

commit c7f85205b36e865e44183a0e18c7cbf2a5fa696c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Oct 15 13:10:10 2021 +0200

    Bug 40373: Add android_ndk_version_build symlink
    
    application-services is refering to an ndk version which includes the
    build number, and expects a directory with this version number in the
    $SDK_HOME/ndk directory, so we add a symlink with that name.
---
 projects/android-toolchain/build                            | 1 +
 projects/android-toolchain/config                           | 1 +
 projects/application-services/list_toolchain_updates_checks | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index 6cd9626..6fa7794 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -16,6 +16,7 @@ mkdir -p $SDK_HOME/cmdline-tools
 unzip -qq [% c("input_files_by_name/android_commandlinetools") %] -d $SDK_HOME/cmdline-tools
 mv $SDK_HOME/cmdline-tools/cmdline-tools $SDK_HOME/cmdline-tools/[% c("var/commandlinetools_version_string") %]
 unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME
+ln -s $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] $NDK_HOME/[% c("var/android_ndk_version_build") %]
 
 # NDK Archive
 # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 76bb98e..b854189 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -33,6 +33,7 @@ var:
   android_platform_revision_29: 04
   android_ndk_version: 21
   android_ndk_revision: d
+  android_ndk_version_build: 21.3.6528147
   # XXX: In commit 83fffa1198c3cbeffec45028971896876e2133a5 mozilla
   # replaced sdk-tools with commandlinetools. We try to do the same here,
   # but it seems sdk-tools is still being used in the build, so we can't
diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks
index f80eda8..2ece96a 100644
--- a/projects/application-services/list_toolchain_updates_checks
+++ b/projects/application-services/list_toolchain_updates_checks
@@ -8,7 +8,7 @@ if (m/^\\s*ndkVersion:\\s"([^"]*)",/) {
 }
 EOF
 needed=$(cat build.gradle | perl -ne "$p")
-current='21.3.6528147'
+current='[% pc("android-toolchain", "var/android_ndk_version_build") %]'
 check_update_needed ndkVersion "$needed" "$current"