From 64451a725523002d2a3cf9f182a8e3bd56e92208 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 2 Jan 2020 14:58:18 +0100 Subject: android: Avoid building the apk when configured with --enable-android-lok. Change-Id: I6e82d1c1c00d67f5ff370a7625e33efbb172ca38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86110 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky (cherry picked from commit f4c83939edb9adb9d81a8a442f5449e619df03dd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86131 Tested-by: Jenkins --- android/source/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'android') diff --git a/android/source/Makefile b/android/source/Makefile index 3fbfcddb0dd3..b64802ec9e78 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -16,10 +16,8 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py $< -j -g core -g writer -g calc -g draw -g edit > $@ install: - ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug - @echo - @echo 'Run it with "make run"' - @echo + if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug ; fi + @if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then echo ; echo 'Run it with "make run"' ; echo ; fi uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME) @@ -30,10 +28,10 @@ clean: rm -f liboSettings.gradle build-gradle: liboSettings.gradle local.properties link-so - ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug) + if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug) ; fi run: - $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity + if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity ; fi debugrun: @echo "please debug with lldb from within Android Studio, or setup ndk-gdb manually (see android/README for details)" -- cgit