summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu J. Poirier <mathieu.poirier@linaro.org>2012-06-19 14:44:56 -0600
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2012-06-21 13:19:40 -0600
commitc5449752f433003ca724315232668c37428ba958 (patch)
tree06ef336a95cedb8e8bf9aa059db22b744e2159da
parent72ae6bebb6f4fc0974b817292188e94d69f8560d (diff)
Removing 'gatord' target definitionandroid-release-2012-07android-release-2012-06
When building in the linaro environment gator is compiled out of the kernel and also happens to have 'gatord' as a target, creating conflicts at compilation time. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rwxr-xr-xtools/gator/daemon/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gator/daemon/Android.mk b/tools/gator/daemon/Android.mk
index 715e5b62ba1..04e2f7ff609 100755
--- a/tools/gator/daemon/Android.mk
+++ b/tools/gator/daemon/Android.mk
@@ -33,9 +33,9 @@ LOCAL_SRC_FILES:= \
LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_MODULE:= gatord
+#LOCAL_MODULE:= gatord
LOCAL_MODULE_TAGS:= optional
LOCAL_LDLIBS := -lz -llog
-include $(BUILD_EXECUTABLE)
+#include $(BUILD_EXECUTABLE)