commit 71a67abef6403656420a7e341ea1109ec0364a96 Author: Nicolas Vigier boklm@torproject.org Date: Fri Oct 15 12:58:28 2021 +0200

Bug 40373: install ndk to $SDK_HOME/ndk

New Android Gradle Plugin versions ignore the ANDROID_NDK_HOME environment variable, and expect to find the NDK in directory $SDK_HOME/ndk. --- projects/android-toolchain/build | 2 +- projects/android-toolchain/config | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a164fc1..6cd9626 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux -export NDK_HOME=$PROJECT_PATH/android-ndk +export NDK_HOME=$SDK_HOME/ndk android_release_dir_9=android-9 android_release_dir_10=android-10 android_release_dir_11=android-11 diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 08e14f6..76bb98e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -17,7 +17,7 @@ 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") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/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 diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 4762a10..e2f9553 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-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/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 5fdcffc..5feea4e 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-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/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 294484c..44243e8 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-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/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 391b0a5..12a3b93 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-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/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