diff options
| author | Daniel Levin <dendy@ti.com> | 2012-12-21 17:15:48 +0200 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:36:13 -0800 |
| commit | 273ffe268a14a270550d584bbaf9c10fed90e3b9 (patch) | |
| tree | 461f36c9c9232173d0e423cc6f6428651b932949 | |
| parent | 7c1db5386a51eb8fbf79930c8f452214a710d6c2 (diff) | |
| download | hardware_ti_omap4-273ffe268a14a270550d584bbaf9c10fed90e3b9.zip hardware_ti_omap4-273ffe268a14a270550d584bbaf9c10fed90e3b9.tar.gz hardware_ti_omap4-273ffe268a14a270550d584bbaf9c10fed90e3b9.tar.bz2 | |
OMAP5: Check TARGET_BOARD_PLATFORM in the root Android.mk
The omap4xxx projects are supposed to be buildable only for OMAP4 and
OMAP5 but not OMAP3.
This patch adds checking for the proper TARGET_BOARD_PLATFORM to the
root Android.mk and removes useless double checking from subprojects.
Change-Id: Ic103304d24c2ffdbb82b3a277d0b66e0e44e4bc0
Signed-off-by: Daniel Levin <dendy@ti.com>
Conflicts:
Android.mk
security/smc_pa_ctrl/Android.mk
security/tee_client_api/Android.mk
security/tf_daemon/Android.mk
| -rwxr-xr-x | camera/Android.mk | 3 | ||||
| -rw-r--r-- | libI420colorconvert/Android.mk | 9 | ||||
| -rw-r--r-- | libion_ti/Android.mk | 5 | ||||
| -rw-r--r-- | libstagefrighthw/Android.mk | 9 | ||||
| -rw-r--r-- | security/smc_pa_ctrl/Android.mk | 3 | ||||
| -rw-r--r-- | security/tee_client_api/Android.mk | 3 | ||||
| -rw-r--r-- | security/tf_crypto_sst/Android.mk | 3 | ||||
| -rw-r--r-- | security/tf_daemon/Android.mk | 3 |
8 files changed, 0 insertions, 38 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 77cd959..a514e45 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) - LOCAL_PATH:= $(call my-dir) #OMAP4_CAMERA_HAL_USES:= OMX @@ -250,4 +248,3 @@ include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) endif endif endif -endif diff --git a/libI420colorconvert/Android.mk b/libI420colorconvert/Android.mk index 7bc9a38..c83fff1 100644 --- a/libI420colorconvert/Android.mk +++ b/libI420colorconvert/Android.mk @@ -1,9 +1,3 @@ -# Only applicable for OMAP4 and OMAP5 boards. -# First eliminate OMAP3 and then ensure that this is not used -# for customer boards -ifneq ($(TARGET_BOARD_PLATFORM),omap3) -ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -21,6 +15,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libI420colorconvert include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) - -endif -endif diff --git a/libion_ti/Android.mk b/libion_ti/Android.mk index ada33f7..671012e 100644 --- a/libion_ti/Android.mk +++ b/libion_ti/Android.mk @@ -1,6 +1,3 @@ -# only include if running on an omap4 platform -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -23,5 +20,3 @@ LOCAL_MODULE := ion_ti_test2 LOCAL_MODULE_TAGS := optional tests LOCAL_SHARED_LIBRARIES := liblog include $(BUILD_EXECUTABLE) - -endif diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 32f913b..a388808 100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -1,9 +1,3 @@ -# Only applicable for OMAP4 and OMAP5 boards. -# First eliminate OMAP3 and then ensure that this is not used -# for customer boards -ifneq ($(TARGET_BOARD_PLATFORM),omap3) -ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -25,6 +19,3 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libstagefrighthw include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) - -endif -endif diff --git a/security/smc_pa_ctrl/Android.mk b/security/smc_pa_ctrl/Android.mk index 0203cad..01050a3 100644 --- a/security/smc_pa_ctrl/Android.mk +++ b/security/smc_pa_ctrl/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -21,4 +19,3 @@ LOCAL_MODULE:= smc_pa_ctrl LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) -endif diff --git a/security/tee_client_api/Android.mk b/security/tee_client_api/Android.mk index 30279a6..adcdb20 100644 --- a/security/tee_client_api/Android.mk +++ b/security/tee_client_api/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -21,4 +19,3 @@ LOCAL_MODULE:= libtee_client_api_driver LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) -endif diff --git a/security/tf_crypto_sst/Android.mk b/security/tf_crypto_sst/Android.mk index 201a658..76910cf 100644 --- a/security/tf_crypto_sst/Android.mk +++ b/security/tf_crypto_sst/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -28,4 +26,3 @@ LOCAL_STATIC_LIBRARIES := libtee_client_api_driver LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) -endif diff --git a/security/tf_daemon/Android.mk b/security/tf_daemon/Android.mk index 50a51e1..ba5e216 100644 --- a/security/tf_daemon/Android.mk +++ b/security/tf_daemon/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -27,4 +25,3 @@ LOCAL_STATIC_LIBRARIES := libtee_client_api_driver LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) -endif |