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)