diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-10 14:06:40 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-11 04:34:45 +0000 |
| commit | a8db357874b3ab3f785457cd9a84c68a05d3c61e (patch) | |
| tree | 5c640e7c73d58a517c7f80fffa5f3861827d4fae /android | |
| parent | e5ec6304149cdcad0d6495b5187c245748b408b5 (diff) | |
gbuild/config stop using VERBOSE, use only verbose=t
configure.ac was setting VERBOSE=YES/NO when really
we use verbose=t or verbose=
Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299
Reviewed-on: https://gerrit.libreoffice.org/17634
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 | ||||
| -rw-r--r-- | android/source/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 84c68814c15a..aaf50cea9f22 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -65,7 +65,7 @@ properties: echo "APP_PLATFORM := android-21" >> jni/Application.mk install: - unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install + unset JAVA_HOME && $(ANT) $(if $(verbose),,-quiet) debug install @echo @echo 'Run it with "make run"' @echo @@ -74,7 +74,7 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) clean: android_version_setup properties - $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) -keep-going clean + $(ANT) $(if $(verbose),,-quiet) -keep-going clean rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml rm -f native-code.cxx rm -rf $(APPCOMPATDIR) diff --git a/android/source/Makefile b/android/source/Makefile index 6f70a91b7651..6711b6c045ec 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -35,7 +35,7 @@ build-ant: android_version_setup copy-stuff prepare-appcompat link-so properties #ownCloud lib dependency $(call COPYJAR,$(WORKDIR)/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar) # - unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug) + unset JAVA_HOME && $(ANT) $(if $(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug) run: adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity |