diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-06-27 15:24:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-06-30 14:48:01 +0200 |
| commit | e3d91e91489bb9db9c4fe0e639255e8088299151 (patch) | |
| tree | 2efe076167ff915b5a0fd933e7538afe915515b7 /android | |
| parent | c79e70f589b9077ac8fde1bb0a6f7f5a438fb6db (diff) | |
android: Allow verbose output from the ant build.
Change-Id: I1086a7ab6bc7913c9c9f2492d07915039007e613
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 | ||||
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 2 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 54bdfa8efdab..7aae130fc693 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -58,7 +58,7 @@ properties: echo "APP_PLATFORM := android-15" >> jni/Application.mk install: build-ant - unset JAVA_HOME && $(ANT) -quiet debug install + unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install @echo @echo 'Run it with "make run"' @echo @@ -67,7 +67,7 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) clean: android_version_setup properties - $(ANT) -quiet -keep-going clean + $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) -keep-going clean rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml rm -f native-code.cxx diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 14de6fee070e..7a25fb922114 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -128,7 +128,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) -quiet debug + unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug run: adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 9bcfc1875789..b70737942a78 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -131,7 +131,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) -quiet debug + unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug run: adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt |