summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2012-10-15 12:54:09 -0700
committerMike J. Chen <mjchen@google.com>2012-10-15 12:54:09 -0700
commit48f7b61596c4d4159141f397a595c76c69da6b9c (patch)
tree1fe0ea621574ee120f23ea148b52a192e9164297
parent3d6b69f0a0fb325443ef8c2987c16af1f8618d3e (diff)
downloadomap4xxx-48f7b61596c4d4159141f397a595c76c69da6b9c.tar.gz
Add conditional on TARGET_BOARD_PLATFORM_VARIANT
Only build if TARGET_BOARD_PLATFORM_VARIANT is not set. Boards (like phantasm) will set TARGET_BOARD_PLATFORM_VARIANT when they want to use a different set of hardware files (like hardware/ti/omap4-aah) and not the ones in this project. Change-Id: I2cd921a97ae66b08494c65e038022fa3c739de72 Signed-off-by: Mike J. Chen <mjchen@google.com>
-rw-r--r--Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 2729bab..81b84d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,8 @@
ifeq ($(TARGET_BOARD_PLATFORM),omap4)
+# only use the generic omap4 modules if no variant is declared
+ifeq ($(strip $(TARGET_BOARD_PLATFORM_VARIANT)),)
+
LOCAL_PATH:= $(call my-dir)
HARDWARE_TI_OMAP4_BASE:= $(LOCAL_PATH)
OMAP4_DEBUG_MEMLEAK:= false
@@ -31,4 +34,6 @@ BUILD_HEAPTRACKED_EXECUTABLE:= $(BUILD_EXECUTABLE)
endif
include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
+
+endif # ifeq ($(strip $(TARGET_BOARD_PLATFORM_VARIANT)),)
+endif # ifeq ($(TARGET_BOARD_PLATFORM),omap4)