Verified Commit 1c0148ad authored by boklm's avatar boklm Committed by aguestuser
Browse files

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.
parent 97826538

projects/android-toolchain/build

+1 −0
Original line number Diff line number Diff line
@@ -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

projects/android-toolchain/config

+1 −0
Original line number Diff line number Diff line
@@ -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

projects/application-services/list_toolchain_updates_checks

+1 −1
Original line number Diff line number Diff line
@@ -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"