summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-01-21 12:50:51 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-26 10:27:41 +0100
commit2b67566adef887664ca41457e4ebeb327cb95e56 (patch)
tree0637dd01551ef04f92ca3167b4ce19cd712ebc49 /android
parent722d4f0cab4897065244f8dc5991394b8030987a (diff)
android: Set the debug / release according to the configure setting.
Change-Id: Ic1c4328b21e1cdca2fdb1aee72b8563af8f770c7
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile
index e700daa2b90a..bc371492c0f3 100644
--- a/android/experimental/LOAndroid3/Makefile
+++ b/android/experimental/LOAndroid3/Makefile
@@ -7,6 +7,7 @@ endif
all: build-ant
# The package of this app
+# The setting from configure (ANDROID_PACKAGE_NAME) is applied in later stages.
APP_PACKAGE=org.libreoffice
DISABLE_UI=TRUE
@@ -33,7 +34,7 @@ build-ant: android_version_setup copy-stuff link-so properties
$(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
#
- unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug
+ unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_DEBUG),debug,release)
run:
adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt