From bd36b992cf2bf2c395ce6f6f0e89d517cc02d1dc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 2 Mar 2013 22:15:23 +0200 Subject: [PATCH] Support an ad-hoc (non-gbuild) Makefile workflow for the Android apps For now, we want to keep being able to just say for instance "make run" in the android app directories. Change-Id: I1898d5466c0df6007fa32b202888bed644fa9489 --- android/experimental/DocumentLoader/Makefile | 4 +++- android/experimental/LibreOffice4Android/Makefile | 4 +++- android/experimental/desktop/Makefile | 4 +++- android/sdremote/Makefile | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 4f738c295f8d..40fd6dcb4113 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. all: build-ant diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index f932235e2579..7984be4278e8 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index eb4b029e70be..273aca614a3a 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. all: build-ant diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index eb78e0de6d02..b8ea1e9088d3 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -6,7 +6,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../config_host.mk +endif all: properties translations.done mkdir -p ../abs-lib/libs