summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-10-01 16:57:12 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-10-15 10:28:27 +0200
commite4d229bbfa7ea08a6015781c41a4eb922838e25d (patch)
tree861db70e12197a17c2a305305873ab9de6e129c2 /android
parent0fb5a696905e09efb63a47c7f5073578e6b62105 (diff)
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. (cherry picked from commit 4475c17da56e6eec034e66f039f941d0f18515bc) Change-Id: Iba921d3cde48875f7a6da4c5ba811cab46dfb89f
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/Makefile.shared2
-rw-r--r--android/source/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index c7c33f8b999f..fc877b79f85e 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) debug install
@echo
@echo 'Run it with "make run"'
@echo
diff --git a/android/source/Makefile b/android/source/Makefile
index 6f70a91b7651..bd1e57655687 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.