Code cleanup for Android.mk

This patch fixup build error and remove unused definitions

Change-Id: I14e03bfb65778bb20a30f5f7a5581e3c378f6b66
Signed-off-by: Yunji Kim <yunji.kim@samsung.com>
Signed-off-by: Huisung Kang <hs1218.kang@samsung.com>

diff --git a/Android.mk b/Android.mk
index 83f1c2ab2c4b4767f0607de47d79812878917de8..3a2778f231038901b18dfabb6510109d41501302 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,15 +1,21 @@
 LOCAL_PATH := $(call my-dir)
-BOARD_USE_ANB := true
 
 include $(CLEAR_VARS)
 
 include device/samsung/$(TARGET_DEVICE)/BoardConfig.mk
 
+BOARD_USE_ANB := true
+
 EXYNOS_OMX_TOP := $(LOCAL_PATH)
 
-EXYNOS_OMX_INC := $(EXYNOS_OMX_TOP)/include/
+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
+EXYNOS_AUDIO_CODEC := \
+       hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/libcodec/audio
+
 include $(EXYNOS_OMX_TOP)/osal/Android.mk
 include $(EXYNOS_OMX_TOP)/core/Android.mk
 

diff --git a/component/audio/dec/Android.mk b/component/audio/dec/Android.mk
index af507218ee83e21fcb817e4837756676304ab640..7b9992fb6869304b3d86379375bed77c69f0f0bd 100644 (file)
--- a/component/audio/dec/Android.mk
+++ b/component/audio/dec/Android.mk
@@ -8,12 +8,14 @@ LOCAL_MODULE := libExynosOMX_Adec
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_STATIC_LIBRARIES := libsrpapi
+
 LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/audio/dec \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/audio/exynos5/srp/alp/include
+       $(EXYNOS_AUDIO_CODEC)/alp/include
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/component/audio/dec/mp3/Android.mk b/component/audio/dec/mp3/Android.mk
index 57fd44e36b7c510df122e9f43afc7f00c39ee859..6b636c5980ab89d651e27fb1da148eecdec2bb80 100644 (file)
--- a/component/audio/dec/mp3/Android.mk
+++ b/component/audio/dec/mp3/Android.mk
@@ -26,6 +26,6 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/audio/dec \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/audio/exynos5/srp/alp/include
+       $(EXYNOS_AUDIO_CODEC)/alp/include
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/component/video/dec/Android.mk b/component/video/dec/Android.mk
index 0d79ec46e47c918ff6ec7d7d86948cbdab56906f..642159dbf1485bc295931f5b3a2d747b2bd646db 100644 (file)
--- a/component/video/dec/Android.mk
+++ b/component/video/dec/Android.mk
@@ -15,12 +15,15 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/dec \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
+
+LOCAL_STATIC_LIBRARIES := libExynosVideoApi
 
 ifeq ($(BOARD_USE_ANB), true)
-LOCAL_STATIC_LIBRARIES := libExynosOMX_OSAL libcsc_helper
+LOCAL_STATIC_LIBRARIES += libExynosOMX_OSAL libcsc_helper
 LOCAL_CFLAGS += -DUSE_ANB
 endif
 

diff --git a/component/video/dec/h264/Android.mk b/component/video/dec/h264/Android.mk
index 5f8957da85ca1293eb432188f10f148b81d1f524..3c7c6ba58154ec20bd9a4e434408e1745314ff6e 100644 (file)
--- a/component/video/dec/h264/Android.mk
+++ b/component/video/dec/h264/Android.mk
@@ -13,16 +13,12 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 
 LOCAL_CFLAGS :=
 
-ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
-LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS
-endif
-
 ifeq ($(BOARD_USE_ANB), true)
 LOCAL_CFLAGS += -DUSE_ANB
 endif
 
 ifeq ($(BOARD_USE_S3D_SUPPORT), true)
-LOCAL_CFLAGS += -DS3D_SUPPORT
+LOCAL_CFLAGS += -DUSE_S3D_SUPPORT
 endif
 
 LOCAL_ARM_MODE := arm
@@ -32,18 +28,15 @@ LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basec
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
 
-ifeq ($(BOARD_USES_MFC_FPS),true)
-LOCAL_CFLAGS += -DCONFIG_MFC_FPS
-endif
-
 LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/dec \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/component/video/dec/mpeg4/Android.mk b/component/video/dec/mpeg4/Android.mk
index 26876ee8b435148b251eadce5ce5b518c0d3d856..a41c613f79e24e466df4a74599577ce3132e2fa0 100644 (file)
--- a/component/video/dec/mpeg4/Android.mk
+++ b/component/video/dec/mpeg4/Android.mk
@@ -13,10 +13,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 
 LOCAL_CFLAGS :=
 
-ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
-LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS
-endif
-
 ifeq ($(BOARD_USE_ANB), true)
 LOCAL_CFLAGS += -DUSE_ANB
 endif
@@ -28,18 +24,15 @@ LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basec
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
 
-ifeq ($(BOARD_USES_MFC_FPS),true)
-LOCAL_CFLAGS += -DCONFIG_MFC_FPS
-endif
-
 LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/dec \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/component/video/dec/vp8/Android.mk b/component/video/dec/vp8/Android.mk
index bd76dfc14aa515986e99cfeaea05f1a4fc8c2366..29cc8832c2ba718c1061d10e34c063e3964ed1fd 100644 (file)
--- a/component/video/dec/vp8/Android.mk
+++ b/component/video/dec/vp8/Android.mk
@@ -13,10 +13,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
 
 LOCAL_CFLAGS :=
 
-ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
-LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS
-endif
-
 ifeq ($(BOARD_USE_ANB), true)
 LOCAL_CFLAGS += -DUSE_ANB
 endif
@@ -28,19 +24,16 @@ LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basec
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
        libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
 
-ifeq ($(BOARD_USES_MFC_FPS),true)
-LOCAL_CFLAGS += -DCONFIG_MFC_FPS
-endif
-
 LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_INC)/exynos \
        $(EXYNOS_OMX_TOP)/osal \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/dec \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 
 

diff --git a/component/video/enc/Android.mk b/component/video/enc/Android.mk
index 7c1c43661db1c57cfda60cb7718bb1ed5aa4d206..22cee815aeb079e5e3d607c529d87dd64ed0cc16 100644 (file)
--- a/component/video/enc/Android.mk
+++ b/component/video/enc/Android.mk
@@ -15,9 +15,10 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/enc \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 ifeq ($(BOARD_USE_METADATABUFFERTYPE), true)
 LOCAL_CFLAGS += -DUSE_METADATABUFFERTYPE

diff --git a/component/video/enc/h264/Android.mk b/component/video/enc/h264/Android.mk
index 9a9174e07d5a315c2d342da5e5f3e1ccc56a8d8e..ea894d16b9f7e4dfca7f7cad181e4d66d9bbdfb5 100644 (file)
--- a/component/video/enc/h264/Android.mk
+++ b/component/video/enc/h264/Android.mk
@@ -31,8 +31,9 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/enc \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/component/video/enc/mpeg4/Android.mk b/component/video/enc/mpeg4/Android.mk
index dbd44f56d6508a3746108393431caae3fed41fa2..739f770304b269a8fc0e82da414c6b293359fe30 100644 (file)
--- a/component/video/enc/mpeg4/Android.mk
+++ b/component/video/enc/mpeg4/Android.mk
@@ -30,8 +30,9 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_TOP)/core \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/enc \
-       hardware/samsung_slsi/exynos5/include \
-       hardware/samsung_slsi/exynos5/libcsc \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
+       $(TOP)/hardware/samsung_slsi/exynos/libcsc \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/osal/Android.mk b/osal/Android.mk
index c58f5e08813600b7c46b584c87966c0e23e9d8e4..ef21a6dfe97cb129d53b94d50ba72e48c6637a48 100644 (file)
--- a/osal/Android.mk
+++ b/osal/Android.mk
@@ -21,11 +21,11 @@ LOCAL_MODULE := libExynosOMX_OSAL
 
 LOCAL_CFLAGS :=
 
-ifeq ($(BOARD_USE_S3D_SUPPORT), true)
-LOCAL_CFLAGS += -DS3D_SUPPORT
+ifeq ($(BOARD_USE_ANB_OUTBUF_SHARE), true)
+LOCAL_CFLAGS += -DUSE_ANB_OUTBUF_SHARE
 endif
 
-LOCAL_STATIC_LIBRARIES := liblog libcutils
+LOCAL_STATIC_LIBRARIES := liblog libcutils libExynosVideoApi
 
 LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_INC)/exynos \
@@ -33,11 +33,11 @@ LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
        $(EXYNOS_OMX_COMPONENT)/common \
        $(EXYNOS_OMX_COMPONENT)/video/dec \
        $(EXYNOS_OMX_COMPONENT)/video/enc \
-       $(EXYNOS_OMX_TOP)/video/dec \
-       $(EXYNOS_OMX_TOP)/video/enc \
-       hardware/samsung_slsi/exynos5/include \
+       $(EXYNOS_VIDEO_CODEC)/v4l2/include \
+       $(TOP)/hardware/samsung_slsi/exynos/include \
        frameworks/native/include/media/hardware \
        frameworks/native/include/media/openmax \
-       hardware/samsung_slsi/exynos5/exynos_omx/codecs/exynos_codecs/video/exynos5/mfc_v4l2/include
+       $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
+       $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include
 
 include $(BUILD_STATIC_LIBRARY)