diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2022-04-19 15:44:08 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-04-20 05:19:20 +0200 |
| commit | 76d50f83274549002cedc7dc6ded0e3eac7c277c (patch) | |
| tree | dc53cdffaba2a9fb8a3f4ae11e73d4894c6c2a42 /config_host.mk.in | |
| parent | 128de1949ff120ac925dbb06e398fa992fb295ba (diff) | |
android: Stop using ANDROID_SDK_HOME env variable
Otherwise, upgrading to Android Gradle Plugin 7.1.3 and
gradle 7.2 (which will be done in a follow-up commit)
would make the build fail like this:
> FAILURE: Build failed with an exception.
>
> * Where:
> Build file '/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/android/source/build.gradle' line: 1
>
> * What went wrong:
> A problem occurred evaluating root project 'source'.
> > Failed to apply plugin 'com.android.internal.application'.
> > ANDROID_SDK_HOME is set to the root of your SDK: /home/michi/Android/Sdk
> 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.
We don't actually rely on `ANDROID_SDK_HOME` being evaluated
by the Android toolchain, but it used to be set in configure.ac,
and the value was then assigned to the `sdk.dir` property written to
`android/source/local.properties`.
Just use a new variable name `ANDROID_SDK_DIR`
and keep the mechanism otherwise unchanged for now.
Change-Id: I44826621a1342119d40036fb704d8ff1eeed7c77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133178
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 7552991e366b..8d7fe3c12865 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -17,7 +17,7 @@ export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@ export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@ export ANDROID_NDK_DIR=@ANDROID_NDK_DIR@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ -export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ +export ANDROID_SDK_DIR=@ANDROID_SDK_DIR@ export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@ export ANDROID_BINUTILS_PREBUILT_ROOT=@ANDROID_BINUTILS_PREBUILT_ROOT@ export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@ |