aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-05-12 21:18:27 +0100
committerJon Medhurst <tixy@linaro.org>2015-05-12 21:18:27 +0100
commit15100ad650ca1ea1d39b186bce9ed51e5c942726 (patch)
tree6896483855f53a3a1151995106a6fecc3ce213eb
parent5d7e40745ac3025e2ef989033f609b7f829723b1 (diff)
parentf0ddf6b40e42579f2275974620399fb3406d0c18 (diff)
Merge branch 'linaro' into android
-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