Merge pull request #84 from liuyq/hikey

gator: Enable multiple source copies to exist in Android build enviro…
linaro-swg · Jun 5, 2015 · 4f24dce · 4f24dce
2 parents b7d46f5 + b4bd259
commit 4f24dce
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/tools/gator/daemon/Android.mk b/tools/gator/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)
@@ -74,3 +78,5 @@ LOCAL_MODULE := gatord
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_EXECUTABLE)
+
+endif