aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-05-12 21:17:43 +0100
committerJon Medhurst <tixy@linaro.org>2015-05-12 21:17:43 +0100
commitf0ddf6b40e42579f2275974620399fb3406d0c18 (patch)
tree6896483855f53a3a1151995106a6fecc3ce213eb
parentc2fdcde9f26fff5eebbcc2ab34adb9d4202e0d55 (diff)
downloadgator-f0ddf6b40e42579f2275974620399fb3406d0c18.tar.gz
gator: Enable multiple source copies to exist in Android build environments
An Android build environment may contain multiple copies of the gator source code, e.g. if it's been copied into a kernel tree as well as having a standalone copy, or if there are two kernel trees with copies. As Android builds tend to include all Android.mk it finds, this can lead to build errors because there is more that one makefile trying to build the daemon. To allow this situation to be catered for we update Android.mk so that if the variable GATOR_DAEMON_PATH is defined, and the makefile doesn't live under that path, then the makefile contents are ignored. An Android build environment can then set GATOR_DAEMON_PATH to specify the copy it wants to use. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--daemon/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/daemon/Android.mk b/daemon/Android.mk
index 68f4a83..c5c8bdc 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -1,4 +1,8 @@
LOCAL_PATH := $(call my-dir)
+
+# Don't use this file if GATOR_DAEMON_PATH is set and we're not under that path
+ifneq ($(and $(GATOR_DAEMON_PATH),$(filter $(patsubst %/,%,$(GATOR_DAEMON_PATH))/%,$(LOCAL_PATH)/)),)
+
include $(CLEAR_VARS)
XML_H := $(shell cd $(LOCAL_PATH) && make events_xml.h defaults_xml.h SrcMd5.cpp)
@@ -74,3 +78,5 @@ LOCAL_MODULE := gatord
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
+
+endif