mm-video: update mk for cm9

Change-Id: I73a1bd021b53ecc4dda7f1490a0e145cdbdcc91a

Android.mk

@@ -1,25 +1,29 @@
 OMX_VIDEO_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(call is-board-platform-in-list,$(QSD8K_BOARD_PLATFORMS)),true)
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+
+ifeq ($(TARGET_BOARD_PLATFORM),qsd8k)
     include $(OMX_VIDEO_PATH)/qdsp6/vdec/Android.mk
     include $(OMX_VIDEO_PATH)/qdsp6/venc/Android.mk
 endif
 
-ifeq ($(call is-chipset-in-board-platform,msm7630),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm7x30)
     include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
     include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
     include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk
 endif
 
-ifeq ($(call is-board-platform,msm8660),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
     include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
     include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
     include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk
 endif
 
-ifeq ($(call is-board-platform,msm8960),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
     include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
     include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
     include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk
 endif
+
+endif #BOARD_USES_QCOM_HARDWARE

vidc/vdec/Android.mk

@@ -23,28 +23,22 @@ libOmxVdec-def += -DENABLE_DEBUG_HIGH
 libOmxVdec-def += -DENABLE_DEBUG_ERROR
 libOmxVdec-def += -UINPUT_BUFFER_LOG
 libOmxVdec-def += -UOUTPUT_BUFFER_LOG
-ifeq ($(call is-chipset-in-board-platform,msm7630),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm7x30)
 libOmxVdec-def += -DMAX_RES_720P
 libOmxVdec-def += -UPROCESS_EXTRADATA_IN_OUTPUT_PORT
 endif
-ifeq ($(call is-board-platform,msm8660),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
 libOmxVdec-def += -DMAX_RES_1080P
 libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
 libOmxVdec-def += -DTEST_TS_FROM_SEI
 endif
-ifeq ($(call is-board-platform,msm8960),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 libOmxVdec-def += -DMAX_RES_1080P
 libOmxVdec-def += -DMAX_RES_1080P_EBI
 libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
 endif
 
-ifeq ($(call is-android-codename,HONEYCOMB),true)
-libOmxVdec-def += -D_ANDROID_HONEYCOMB_
-endif
-
-ifeq ($(call is-android-codename,ICECREAM_SANDWICH),true)
 libOmxVdec-def += -D_ANDROID_ICS_
-endif
 
 ifeq ($(TARGET_USES_ION),true)
 libOmxVdec-def += -DUSE_ION
@@ -61,35 +55,30 @@ libmm-vdec-inc          := $(LOCAL_PATH)/inc
 libmm-vdec-inc          += $(OMX_VIDEO_PATH)/vidc/common/inc
 
 libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-libmm-vdec-inc          += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 #DRM include - Interface which loads the DRM library
 libmm-vdec-inc	        += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc
 
-ifeq ($(call is-android-codename,ICECREAM_SANDWICH),true)
 libmm-vdec-inc          += $(TOP)/hardware/qcom/display/libgralloc \
                         += $(TOP)/hardware/qcom/display/libgenlock
-else
-libmm-vdec-inc          += $(TOP)/hardware/msm7k/libgralloc-qsd8k
-endif
 
 LOCAL_MODULE                    := libOmxVdec
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libOmxVdec-def)
 LOCAL_C_INCLUDES                := $(libmm-vdec-inc)
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils
 
-ifeq ($(call is-android-codename,ICECREAM_SANDWICH),true)
-LOCAL_SHARED_LIBRARIES += libgenlock
-endif
+LOCAL_SHARED_LIBRARIES  += libgenlock
 LOCAL_SHARED_LIBRARIES  += libdivxdrmdecrypt
 
 LOCAL_SRC_FILES         := src/frameparser.cpp
 LOCAL_SRC_FILES         += src/h264_utils.cpp
 LOCAL_SRC_FILES         += src/ts_parser.cpp
-ifeq ($(call is-board-platform-in-list,msm8660 msm8960),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
+LOCAL_SRC_FILES         += src/mp4_utils.cpp
+endif
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 LOCAL_SRC_FILES         += src/mp4_utils.cpp
 endif
 LOCAL_SRC_FILES         += src/omx_vdec.cpp
@@ -103,13 +92,11 @@ include $(CLEAR_VARS)
 
 mm-vdec-test-inc    := $(TARGET_OUT_HEADERS)/mm-core/omxcore
 mm-vdec-test-inc    += $(LOCAL_PATH)/inc
-mm-vdec-test-inc    += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 LOCAL_MODULE                    := mm-vdec-omx-test
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libOmxVdec-def)
 LOCAL_C_INCLUDES                := $(mm-vdec-test-inc)
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := libutils libOmxCore libOmxVdec libbinder
@@ -126,13 +113,11 @@ include $(CLEAR_VARS)
 
 mm-vdec-drv-test-inc    := $(TARGET_OUT_HEADERS)/mm-core/omxcore
 mm-vdec-drv-test-inc    += $(LOCAL_PATH)/inc
-mm-vdec-drv-test-inc    += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 LOCAL_MODULE                    := mm-video-driver-test
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libOmxVdec-def)
 LOCAL_C_INCLUDES                := $(mm-vdec-drv-test-inc)
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_PRELINK_MODULE            := false
 
 LOCAL_SRC_FILES                 := src/message_queue.c

vidc/venc/Android.mk

@@ -21,22 +21,20 @@ libmm-venc-def += -DENABLE_DEBUG_ERROR
 libmm-venc-def += -UINPUT_BUFFER_LOG
 libmm-venc-def += -UOUTPUT_BUFFER_LOG
 libmm-venc-def += -USINGLE_ENCODER_INSTANCE
-ifeq ($(call is-chipset-in-board-platform,msm7630),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm7x30)
 libmm-venc-def += -DMAX_RES_720P
 endif
-ifeq ($(call is-board-platform,msm8660),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
 libmm-venc-def += -DMAX_RES_1080P
 endif
-ifeq ($(call is-board-platform,msm8960),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 libmm-venc-def += -DMAX_RES_1080P
 libmm-venc-def += -DMAX_RES_1080P_EBI
 endif
 ifeq ($(TARGET_USES_ION),true)
 libmm-venc-def += -DUSE_ION
 endif
-ifeq ($(call is-android-codename,ICECREAM_SANDWICH),true)
 libmm-venc-def += -D_ANDROID_ICS_
-endif
 # ---------------------------------------------------------------------------------
 # 			Make the Shared library (libOmxVenc)
 # ---------------------------------------------------------------------------------
@@ -46,17 +44,13 @@ include $(CLEAR_VARS)
 libmm-venc-inc      := $(LOCAL_PATH)/inc
 libmm-venc-inc      += $(OMX_VIDEO_PATH)/vidc/common/inc
 libmm-venc-inc      += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-libmm-venc-inc      += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-ifeq ($(call is-android-codename,ICECREAM_SANDWICH),true)
 libmm-venc-inc      += $(TOP)/hardware/qcom/media/libstagefrighthw
 libmm-venc-inc      += $(TOP)/hardware/qcom/display/libgralloc
-endif
 
 LOCAL_MODULE                    := libOmxVenc
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(libmm-venc-inc)
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils
@@ -77,13 +71,11 @@ include $(CLEAR_VARS)
 mm-venc-test720p-inc            := $(TARGET_OUT_HEADERS)/mm-core/omxcore
 mm-venc-test720p-inc            += $(LOCAL_PATH)/inc
 mm-venc-test720p-inc            += $(OMX_VIDEO_PATH)/vidc/common/inc
-mm-venc-test720p-inc            += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 LOCAL_MODULE                    := mm-venc-omx-test720p
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(mm-venc-test720p-inc)
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_PRELINK_MODULE            := false
 LOCAL_SHARED_LIBRARIES          := libmm-omxcore libOmxVenc libbinder
 
@@ -105,8 +97,6 @@ venc-test-inc                   += $(LOCAL_PATH)/inc
 LOCAL_MODULE                    := mm-video-encdrv-test
 LOCAL_MODULE_TAGS               := optional
 LOCAL_C_INCLUDES                := $(venc-test-inc)
-LOCAL_C_INCLUDES                += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES   := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_PRELINK_MODULE            := false
 
 LOCAL_SRC_FILES                 := test/video_encoder_test.c