commit 646723c06120cc9344463f6b3f001178e606838f
author Emilian Peev <epeev@mm-sol.com> Mon Nov 05 16:15:34 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 05 16:15:34 2012 -0800
tree 57934572a5f2aadde89cd183d7ce61939b66b857
parent 6438f90cb8c3702cbd5a742c2535bcffb25e99bc
parent b96dffd40e25d29a61f9fbd7f2e5968b5335b957

am b96dffd4: CameraHal: Sync AF cancel with incoming OMX events

* commit 'b96dffd40e25d29a61f9fbd7f2e5968b5335b957':
  CameraHal: Sync AF cancel with incoming OMX events

Android.mk

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 @@
 endif
 
 include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
+
+endif # ifeq ($(strip $(TARGET_BOARD_PLATFORM_VARIANT)),)
+endif # ifeq ($(TARGET_BOARD_PLATFORM),omap4)