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 /android/Bootstrap | |
| 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 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 18082ea30ea3..83a2383581e4 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -24,7 +24,7 @@ OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI) local.properties: $(BUILDDIR)/config_host.mk echo ndk.dir=$(ANDROID_NDK_DIR) >local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) >>local.properties + echo sdk.dir=$(ANDROID_SDK_DIR) >>local.properties # # Build / link the single .so for this app @@ -84,7 +84,7 @@ link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries $(SODEST)/libc++ # can't "stop" a device anyway.) stop-start-cycle: - $(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10 + $(ANDROID_SDK_DIR)/platform-tools/adb shell stop && $(ANDROID_SDK_DIR)/platform-tools/adb shell start && sleep 10 # build-host specific stuff (build paths and the like) to keep build.gradle static liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk |