diff options
| author | Mike J. Chen <mjchen@google.com> | 2012-10-16 17:33:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 17:33:24 -0700 |
| commit | 6438f90cb8c3702cbd5a742c2535bcffb25e99bc (patch) | |
| tree | 75f42b45ce299f9a63a77184f846d5ebabde9889 | |
| parent | b6a9d10508e321ebc53193a117bf6c65d98ae888 (diff) | |
| parent | 48f7b61596c4d4159141f397a595c76c69da6b9c (diff) | |
| download | omap4xxx-6438f90cb8c3702cbd5a742c2535bcffb25e99bc.tar.gz | |
Merge "Add conditional on TARGET_BOARD_PLATFORM_VARIANT" into jb-mr1-aah-dev
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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) |