[Libreoffice-commits] core.git: android/Bootstrap android/source

[Miklos Vajna]

 android/Bootstrap/Makefile.shared |    2 +-
 android/source/Makefile           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4475c17da56e6eec034e66f039f941d0f18515bc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Oct 1 16:57:12 2015 +0200

    android: fix make install and don't use ant -quiet by default
    
    Unlike 'make -s', 'ant -quiet' will stay silent even if there was an
    error.
    
    Change-Id: Iba921d3cde48875f7a6da4c5ba811cab46dfb89f

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index a2aa45c..01fc8ec 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),,-quiet) debug install
+	unset JAVA_HOME && $(ANT) debug install
 	@echo
 	@echo 'Run it with "make run"'
 	@echo
diff --git a/android/source/Makefile b/android/source/Makefile
index 6711b6c..5c51db8 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -1,6 +1,6 @@
 ifeq ($(BUILDDIR),)
 gb_Side:=host
-include ../../../config_host.mk
+include ../../config_host.mk
 endif
 
 # The default target just builds.