From 62138ba4caa6956b03b5c51aa1b3988332466db5 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Tue, 27 Aug 2013 14:10:28 -0700 Subject: [PATCH] openmax: only build for insignal SLSI variant --- Android.mk | 10 ++++++++-- component/video/dec/Android.mk | 4 +++- component/video/dec/h264/Android.mk | 4 +++- component/video/dec/mpeg2/Android.mk | 4 +++- component/video/dec/mpeg4/Android.mk | 4 +++- component/video/dec/vc1/Android.mk | 4 +++- component/video/dec/vp8/Android.mk | 4 +++- component/video/enc/Android.mk | 4 +++- component/video/enc/h264/Android.mk | 4 +++- component/video/enc/mpeg4/Android.mk | 4 +++- osal/Android.mk | 4 +++- 11 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index fdce9ef..c871a4a 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,9 @@ LOCAL_PATH := $(call my-dir) +ifeq ($(TARGET_SLSI_VARIANT),insignal) + +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + include $(CLEAR_VARS) BOARD_USE_ANB := true @@ -17,9 +21,9 @@ EXYNOS_OMX_INC := $(EXYNOS_OMX_TOP)/include EXYNOS_OMX_COMPONENT := $(EXYNOS_OMX_TOP)/component EXYNOS_VIDEO_CODEC := \ - hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/libcodec/video + hardware/samsung_slsi/$(PLATFORM_DIR)/libcodec/video EXYNOS_AUDIO_CODEC := \ - hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/libcodec/audio + hardware/samsung_slsi/$(PLATFORM_DIR)/libcodec/audio include $(EXYNOS_OMX_TOP)/osal/Android.mk include $(EXYNOS_OMX_TOP)/core/Android.mk @@ -46,3 +50,5 @@ endif ifeq ($(BOARD_USE_WMA_CODEC), true) include $(EXYNOS_OMX_COMPONENT)/audio/dec/wma/Android.mk endif + +endif diff --git a/component/video/dec/Android.mk b/component/video/dec/Android.mk index 45ed235..be3fc0c 100644 --- a/component/video/dec/Android.mk +++ b/component/video/dec/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_SRC_FILES := \ Exynos_OMX_VdecControl.c \ Exynos_OMX_Vdec.c @@ -17,7 +19,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include LOCAL_STATIC_LIBRARIES := libExynosVideoApi diff --git a/component/video/dec/h264/Android.mk b/component/video/dec/h264/Android.mk index 7b25889..788da11 100644 --- a/component/video/dec/h264/Android.mk +++ b/component/video/dec/h264/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -47,7 +49,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/dec/mpeg2/Android.mk b/component/video/dec/mpeg2/Android.mk index d378baa..92b7e09 100644 --- a/component/video/dec/mpeg2/Android.mk +++ b/component/video/dec/mpeg2/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -43,7 +45,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/dec/mpeg4/Android.mk b/component/video/dec/mpeg4/Android.mk index 26ab170..12eb90e 100644 --- a/component/video/dec/mpeg4/Android.mk +++ b/component/video/dec/mpeg4/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -43,7 +45,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/dec/vc1/Android.mk b/component/video/dec/vc1/Android.mk index d347c68..a180aa0 100644 --- a/component/video/dec/vc1/Android.mk +++ b/component/video/dec/vc1/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -43,7 +45,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/dec/vp8/Android.mk b/component/video/dec/vp8/Android.mk index 94baa5a..28133fc 100644 --- a/component/video/dec/vp8/Android.mk +++ b/component/video/dec/vp8/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -40,7 +42,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/dec \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/enc/Android.mk b/component/video/enc/Android.mk index 3ed9b0d..61471c3 100644 --- a/component/video/enc/Android.mk +++ b/component/video/enc/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_SRC_FILES := \ Exynos_OMX_VencControl.c \ Exynos_OMX_Venc.c @@ -17,7 +19,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/enc \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/enc/h264/Android.mk b/component/video/enc/h264/Android.mk index 6f4b902..b7e6f5c 100644 --- a/component/video/enc/h264/Android.mk +++ b/component/video/enc/h264/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -45,7 +47,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/enc \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/component/video/enc/mpeg4/Android.mk b/component/video/enc/mpeg4/Android.mk index 1ea4920..7042335 100644 --- a/component/video/enc/mpeg4/Android.mk +++ b/component/video/enc/mpeg4/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -40,7 +42,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/enc \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER diff --git a/osal/Android.mk b/osal/Android.mk index 2f65424..9c36287 100644 --- a/osal/Android.mk +++ b/osal/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal + LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ @@ -47,7 +49,7 @@ LOCAL_C_INCLUDES := \ $(EXYNOS_OMX_COMPONENT)/video/enc \ $(EXYNOS_VIDEO_CODEC)/v4l2/include \ $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \ + $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \ $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true) -- 2.20.1