diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-05-11 14:34:54 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-05-11 14:34:54 +0100 |
| commit | 66de4b5dc66d8a3f0990ad99ab868db4ad267240 (patch) | |
| tree | fb32ef8d494ee1952b99a65f876a9e28da004a1b | |
| parent | 0c2fc7bf0a5466f059675633b6b179a118757a13 (diff) | |
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-- | tools/gator/daemon/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/gator/daemon/Android.mk b/tools/gator/daemon/Android.mk index 68f4a8397379..c5c8bdc1ff29 100644 --- 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 SrcMd5.cpp) @@ -74,3 +78,5 @@ LOCAL_MODULE := gatord LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) + +endif |