commit 80262148d9d7464099ae5c91f5fbfeef1ae3a760 Author: Nicolas Vigier boklm@torproject.org Date: Tue Oct 19 12:02:54 2021 +0200

Bug 40373: Don't set ANDROID_SDK_HOME

While building android-components with gradle 7.0.2 we get the following error:

A problem occurred evaluating project ':browser-awesomebar'. > Failed to apply plugin 'com.android.internal.library'. > ANDROID_SDK_HOME is set to the root of your SDK: /var/tmp/dist/android-toolchain/android-sdk-linux ANDROID_SDK_HOME was meant to be the parent path of the preference folder expected by the Android tools. It is now deprecated.

To set a custom preference folder location, use ANDROID_USER_HOME.

It should NOT be set to the same directory as the root of your SDK. To set a custom SDK location, use ANDROID_HOME.

To avoid this error, we don't set ANDROID_SDK_HOME and only set ANDROID_HOME. --- projects/android-toolchain/config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index b854189..47108de 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,16 +13,15 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_HOME=/var/tmp/dist/[% project %]/android-sdk-linux # 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=$ANDROID_SDK_HOME/ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_HOME=$ANDROID_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 export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle - export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin mkdir -p "$GRADLE_HOME"