mm-video-v4l2: Cleanup makefiles

Use MSM_VIDC_TARGET_LIST defined globally to identify which target
to build component and its supporting modules for.

Change-Id: Ida0ae3fba15ab5e80e1d919e9aa4524106e54bb7

7 files changed, 99 insertions, 259 deletions

diff --git a/Android.mk b/Android.mk
index eca547fd..d8dfe60a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,20 +1,18 @@
 QCOM_MEDIA_ROOT := $(call my-dir)
-ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),)
-include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
-endif
+$(warning target list is : $(MSM_VIDC_TARGET_LIST))
 
-ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),)
+#Compile these for all targets under QCOM_BOARD_PLATFORMS list.
+ifeq ($(call is-board-platform-in-list, $(QCOM_BOARD_PLATFORMS)),true)
+include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
 include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
 endif
 
-ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM)),)
+ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
 include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
-endif
-
-ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),)
 include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
-endif
 
-ifneq ($(filter apq8084,$(TARGET_BOARD_PLATFORM)),)
+ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
 include $(QCOM_MEDIA_ROOT)/videopp/Android.mk
 endif
+
+endif
diff --git a/mm-video-v4l2/Android.mk b/mm-video-v4l2/Android.mk
index 487eb3e2..36752138 100644
--- a/mm-video-v4l2/Android.mk
+++ b/mm-video-v4l2/Android.mk
@@ -1,8 +1,2 @@
 OMX_VIDEO_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-include $(OMX_VIDEO_PATH)/vidc/common/Android.mk
-include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
-include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
-include $(OMX_VIDEO_PATH)/vidc/test/Android.mk
-include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk
+include $(call all-makefiles-under,$(OMX_VIDEO_PATH))
diff --git a/mm-video-v4l2/vidc/Android.mk b/mm-video-v4l2/vidc/Android.mk
new file mode 100644
index 00000000..5c069fed
--- /dev/null
+++ b/mm-video-v4l2/vidc/Android.mk
@@ -0,0 +1,2 @@
+LOCAL_PATH := $(call my-dir)
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index f8d0d4a7..2453f0d4 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
-
 ROOT_DIR := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -41,7 +39,6 @@ LOCAL_SRC_FILES   := src/extra_data_handler.cpp
 LOCAL_SRC_FILES   += src/vidc_color_converter.cpp
 
 include $(BUILD_STATIC_LIBRARY)
-endif #BUILD_TINY_ANDROID
 
 # ---------------------------------------------------------------------------------
 # 					END
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 2cba6b50..9a64f4b8 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -1,127 +1,61 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
-
 LOCAL_PATH := $(call my-dir)
-OMX_VIDEO_PATH := $(TOP)/hardware/qcom/media/mm-video-v4l2
 include $(CLEAR_VARS)
 
 # ---------------------------------------------------------------------------------
 # 				Common definitons
 # ---------------------------------------------------------------------------------
 
-libOmxVdec-def := -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\)
-libOmxVdec-def += -D__align=__alignx
-libOmxVdec-def += -Dinline=__inline
-libOmxVdec-def += -g -O3
-libOmxVdec-def += -DIMAGE_APPS_PROC
-libOmxVdec-def += -D_ANDROID_
-libOmxVdec-def += -DCDECL
-libOmxVdec-def += -DT_ARM
-libOmxVdec-def += -DNO_ARM_CLZ
-libOmxVdec-def += -UENABLE_DEBUG_LOW
-libOmxVdec-def += -UENABLE_DEBUG_HIGH
-libOmxVdec-def += -DENABLE_DEBUG_ERROR
-libOmxVdec-def += -UINPUT_BUFFER_LOG
-libOmxVdec-def += -UOUTPUT_BUFFER_LOG
-libOmxVdec-def += -Wno-parentheses
-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 ($(TARGET_BOARD_PLATFORM),msm8960)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8960_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8974)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm7627a)
-libOmxVdec-def += -DMAX_RES_720P
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf)
-libOmxVdec-def += -DMAX_RES_720P
+libmm-vdec-def := -D__alignx\(x\)=__attribute__\(\(__aligned__\(x\)\)\)
+libmm-vdec-def += -D__align=__alignx
+libmm-vdec-def += -Dinline=__inline
+libmm-vdec-def += -g -O3
+libmm-vdec-def += -DIMAGE_APPS_PROC
+libmm-vdec-def += -D_ANDROID_
+libmm-vdec-def += -DCDECL
+libmm-vdec-def += -DT_ARM
+libmm-vdec-def += -DNO_ARM_CLZ
+libmm-vdec-def += -UENABLE_DEBUG_LOW
+libmm-vdec-def += -UENABLE_DEBUG_HIGH
+libmm-vdec-def += -DENABLE_DEBUG_ERROR
+libmm-vdec-def += -UINPUT_BUFFER_LOG
+libmm-vdec-def += -UOUTPUT_BUFFER_LOG
+libmm-vdec-def += -Wno-parentheses
+libmm-vdec-def += -D_ANDROID_ICS_
+libmm-vdec-def += -D_MSM8974_
+libmm-vdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
+libmm-vdec-def += -DMAX_RES_1080P
+libmm-vdec-def += -DMAX_RES_1080P_EBI
+
+TARGETS_THAT_USE_HEVC_ADSP_HEAP := msm8226 msm8974
+TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994
+TARGETS_THAT_NEED_HEVC_LIB := msm8974 msm8610 msm8226 msm8916
+TARGETS_THAT_NEED_SW_HEVC := msm8974 msm8226 msm8916
+
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_HEVC_ADSP_HEAP)),true)
+libmm-vdec-def += -D_HEVC_USE_ADSP_HEAP_
+endif
+
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_HAVE_VENUS_HEVC)),true)
+libmm-vdec-def += -DVENUS_HEVC
 endif
+
 ifeq ($(TARGET_BOARD_PLATFORM),msm8610)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -DSMOOTH_STREAMING_DISABLED
-libOmxVdec-def += -DH264_PROFILE_LEVEL_CHECK
-libOmxVdec-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8226)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -DVENUS_HEVC
+libmm-vdec-def += -DSMOOTH_STREAMING_DISABLED
+libmm-vdec-def += -DH264_PROFILE_LEVEL_CHECK
 endif
-ifeq ($(TARGET_BOARD_PLATFORM),mpq8092)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -DVENUS_HEVC
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm_bronze)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8916)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8909)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8994)
-libOmxVdec-def += -DMAX_RES_1080P
-libOmxVdec-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libOmxVdec-def += -D_MSM8974_
-libOmxVdec-def += -DVENUS_HEVC
-endif
-
-libOmxVdec-def += -D_ANDROID_ICS_
 
 ifeq ($(TARGET_USES_ION),true)
-libOmxVdec-def += -DUSE_ION
+libmm-vdec-def += -DUSE_ION
 endif
 
 ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 18 ))" )))
-libOmxVdec-def += -DANDROID_JELLYBEAN_MR1=1
+libmm-vdec-def += -DANDROID_JELLYBEAN_MR1=1
 endif
 
-vdec-inc          = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-
-# ---------------------------------------------------------------------------------
-# 			Make the Shared library (libOmxVdec)
-# ---------------------------------------------------------------------------------
-
 include $(CLEAR_VARS)
 
-libmm-vdec-inc          += $(LOCAL_PATH)/inc 
+# Common Includes
+libmm-vdec-inc          := $(LOCAL_PATH)/inc
 libmm-vdec-inc          += $(OMX_VIDEO_PATH)/vidc/common/inc
 libmm-vdec-inc          += $(TOP)/hardware/qcom/media/mm-core/inc
 #DRM include - Interface which loads the DRM library
@@ -130,26 +64,35 @@ libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/qcom/display
 libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/adreno
 libmm-vdec-inc          += $(TOP)/frameworks/native/include/media/openmax
 libmm-vdec-inc          += $(TOP)/frameworks/native/include/media/hardware
-libmm-vdec-inc          += $(vdec-inc)
 libmm-vdec-inc      	+= $(TOP)/hardware/qcom/media/libc2dcolorconvert
 libmm-vdec-inc      	+= $(TOP)/frameworks/av/include/media/stagefright
 libmm-vdec-inc      	+= $(TARGET_OUT_HEADERS)/mm-video/SwVdec
+libmm-vdec-inc      	+= $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 ifeq ($(PLATFORM_SDK_VERSION), 18)  #JB_MR2
-libOmxVdec-def += -DANDROID_JELLYBEAN_MR2=1
+libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1
 libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw
 endif
 
+# Common Dependencies
+libmm-vdec-add-dep := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 ifeq ($(call is-platform-sdk-version-at-least, 19),true)
 # This feature is enabled for Android KK+
-libOmxVdec-def += -DADAPTIVE_PLAYBACK_SUPPORTED
+libmm-vdec-def += -DADAPTIVE_PLAYBACK_SUPPORTED
 endif
 
+# ---------------------------------------------------------------------------------
+# 			Make the Shared library (libOmxVdec)
+# ---------------------------------------------------------------------------------
+
+include $(CLEAR_VARS)
+
 LOCAL_MODULE                    := libOmxVdec
-LOCAL_ADDITIONAL_DEPENDENCIES   := libOmxVdecHevc
 LOCAL_MODULE_TAGS               := optional
-LOCAL_CFLAGS                    := $(libOmxVdec-def) -Werror
+LOCAL_CFLAGS                    := $(libmm-vdec-def) -Werror
 LOCAL_C_INCLUDES                += $(libmm-vdec-inc)
+LOCAL_ADDITIONAL_DEPENDENCIES   := $(libmm-vdec-add-dep)
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils libdl
@@ -163,11 +106,7 @@ LOCAL_SRC_FILES         += src/ts_parser.cpp
 LOCAL_SRC_FILES         += src/mp4_utils.cpp
 LOCAL_SRC_FILES         += src/hevc_utils.cpp
 LOCAL_STATIC_LIBRARIES  := libOmxVidcCommon
-ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM)))
 LOCAL_SRC_FILES         += src/omx_vdec_msm8974.cpp
-endif
-
-LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -181,13 +120,13 @@ include $(CLEAR_VARS)
 # libOmxVdecHevc library is not built for OSS builds as QCPATH is null in OSS builds.
 
 ifneq "$(wildcard $(QCPATH) )" ""
-ifneq (,$(filter msm8974 msm8610 msm8226 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)))
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_HEVC_LIB)),true)
 
 LOCAL_MODULE                    := libOmxVdecHevc
-LOCAL_ADDITIONAL_DEPENDENCIES   := libOmxVenc
 LOCAL_MODULE_TAGS               := optional
-LOCAL_CFLAGS                    := $(libOmxVdec-def)
+LOCAL_CFLAGS                    := $(libmm-vdec-def)
 LOCAL_C_INCLUDES                += $(libmm-vdec-inc)
+LOCAL_ADDITIONAL_DEPENDENCIES   := $(libmm-vdec-add-dep)
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils libdl
@@ -200,7 +139,7 @@ LOCAL_SRC_FILES         += src/h264_utils.cpp
 LOCAL_SRC_FILES         += src/ts_parser.cpp
 LOCAL_SRC_FILES         += src/mp4_utils.cpp
 
-ifneq (,$(filter msm8974 msm8226 msm8916,$(TARGET_BOARD_PLATFORM)))
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_HEVC)),true)
 LOCAL_SHARED_LIBRARIES  += libHevcSwDecoder
 LOCAL_SRC_FILES         += src/omx_vdec_hevc_swvdec.cpp
 else
@@ -210,7 +149,6 @@ endif
 LOCAL_SRC_FILES         += src/hevc_utils.cpp
 
 LOCAL_STATIC_LIBRARIES  := libOmxVidcCommon
-LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -218,8 +156,6 @@ endif
 endif
 
 
-endif #BUILD_TINY_ANDROID
-
 # ---------------------------------------------------------------------------------
 #                END
 # ---------------------------------------------------------------------------------
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index f4c964a5..85a05944 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -1,11 +1,5 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
-
-ROOT_DIR := $(call my-dir)
-OMX_VIDEO_PATH := $(ROOT_DIR)/../..
-
-
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_PATH:= $(ROOT_DIR)
 
 # ---------------------------------------------------------------------------------
 # 				Common definitons
@@ -24,91 +18,35 @@ libmm-venc-def += -UINPUT_BUFFER_LOG
 libmm-venc-def += -UOUTPUT_BUFFER_LOG
 libmm-venc-def += -USINGLE_ENCODER_INSTANCE
 libmm-venc-def += -Werror
-ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -UENABLE_GET_SYNTAX_HDR
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libmm-venc-def += -UENABLE_GET_SYNTAX_HDR
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8974)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
+libmm-venc-def += -D_ANDROID_ICS_
 libmm-venc-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm7627a)
-libmm-venc-def += -DMAX_RES_720P
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm7630_surf)
-libmm-venc-def += -DMAX_RES_720P
-endif
+
+TARGETS_THAT_USE_FLAG_MSM8226 := msm8226 msm8916 msm8909
+TARGETS_THAT_NEED_SW_VENC_MPEG4 := msm8909
+TARGETS_THAT_NEED_SW_VENC_HEVC := msm8992
+
 ifeq ($(TARGET_BOARD_PLATFORM),msm8610)
 libmm-venc-def += -DMAX_RES_720P
-libmm-venc-def += -D_MSM8974_
 libmm-venc-def += -D_MSM8610_
-endif
+else
 ifeq ($(TARGET_BOARD_PLATFORM),msm8226)
 libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -D_MSM8974_
-libmm-venc-def += -D_MSM8226_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),mpq8092)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
-endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm_bronze)
+else
 libmm-venc-def += -DMAX_RES_1080P
 libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
 endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8916)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
-libmm-venc-def += -D_MSM8226_
 endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8909)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
+
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_FLAG_MSM8226)),true)
 libmm-venc-def += -D_MSM8226_
 endif
-ifeq ($(TARGET_BOARD_PLATFORM),msm8994)
-libmm-venc-def += -DMAX_RES_1080P
-libmm-venc-def += -DMAX_RES_1080P_EBI
-libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
-libmm-venc-def += -D_MSM8974_
-endif
 
 ifeq ($(TARGET_USES_ION),true)
 libmm-venc-def += -DUSE_ION
 endif
 
-venc-inc       = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-
-libmm-venc-def += -D_ANDROID_ICS_
-
-# ---------------------------------------------------------------------------------
-# 			Make the Shared library (libOmxVenc)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-libmm-venc-inc      += $(LOCAL_PATH)/inc
+# Common Includes
+libmm-venc-inc      := $(LOCAL_PATH)/inc
 libmm-venc-inc      += $(OMX_VIDEO_PATH)/vidc/common/inc
 libmm-venc-inc      += hardware/qcom/media/mm-core/inc
 libmm-venc-inc      += hardware/qcom/media/libstagefrighthw
@@ -118,12 +56,22 @@ libmm-venc-inc      += frameworks/native/include/media/hardware
 libmm-venc-inc      += frameworks/native/include/media/openmax
 libmm-venc-inc      += hardware/qcom/media/libc2dcolorconvert
 libmm-venc-inc      += frameworks/av/include/media/stagefright
-libmm-venc-inc      += $(venc-inc)
+libmm-venc-inc      += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+
+# Common Dependencies
+libmm-venc-add-dep  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+# ---------------------------------------------------------------------------------
+# 			Make the Shared library (libOmxVenc)
+# ---------------------------------------------------------------------------------
+
+include $(CLEAR_VARS)
 
 LOCAL_MODULE                    := libOmxVenc
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(libmm-venc-inc)
+LOCAL_ADDITIONAL_DEPENDENCIES   := $(libmm-venc-add-dep)
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils \
@@ -132,35 +80,17 @@ LOCAL_STATIC_LIBRARIES    := libOmxVidcCommon
 
 LOCAL_SRC_FILES   := src/omx_video_base.cpp
 LOCAL_SRC_FILES   += src/omx_video_encoder.cpp
-ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM)))
 LOCAL_SRC_FILES   += src/video_encoder_device_v4l2.cpp
-else
-LOCAL_SRC_FILES   += src/video_encoder_device.cpp
-endif
-
-LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
 
 include $(BUILD_SHARED_LIBRARY)
 
-ifeq ($(TARGET_BOARD_PLATFORM),msm8909)
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true)
 # ---------------------------------------------------------------------------------
 # 			Make the Shared library (libOmxSwVencMpeg4)
 # ---------------------------------------------------------------------------------
 
 include $(CLEAR_VARS)
 
-libmm-venc-inc      += $(LOCAL_PATH)/inc
-libmm-venc-inc      += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-venc-inc      += hardware/qcom/media/mm-core/inc
-libmm-venc-inc      += hardware/qcom/media/libstagefrighthw
-libmm-venc-inc      += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-venc-inc      += $(TARGET_OUT_HEADERS)/adreno
-libmm-venc-inc      += frameworks/native/include/media/hardware
-libmm-venc-inc      += frameworks/native/include/media/openmax
-libmm-venc-inc      += hardware/qcom/media/libc2dcolorconvert
-libmm-venc-inc      += frameworks/av/include/media/stagefright
-libmm-venc-inc      += $(venc-inc)
 libmm-venc-inc      += $(TARGET_OUT_HEADERS)/mm-video/swvenc
 
 LOCAL_MODULE                    := libOmxSwVencMpeg4
@@ -168,6 +98,7 @@ LOCAL_MODULE                    := libOmxSwVencMpeg4
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(libmm-venc-inc)
+LOCAL_ADDITIONAL_DEPENDENCIES   := $(libmm-venc-add-dep)
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils \
@@ -178,50 +109,35 @@ LOCAL_STATIC_LIBRARIES    := libOmxVidcCommon
 LOCAL_SRC_FILES   := src/omx_video_base.cpp
 LOCAL_SRC_FILES   += src/omx_swvenc_mpeg4.cpp
 
-LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
 include $(BUILD_SHARED_LIBRARY)
 endif
 
-ifeq ($(TARGET_BOARD_PLATFORM),msm8992)
+ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_HEVC)),true)
 # ---------------------------------------------------------------------------------
 #                            Make the Shared library (libOmxSwVenc)
 # ---------------------------------------------------------------------------------
 include $(CLEAR_VARS)
-libmm-venc-inc      += $(LOCAL_PATH)/inc
-libmm-venc-inc      += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-venc-inc      += hardware/qcom/media/mm-core/inc
-libmm-venc-inc      += hardware/qcom/media/libstagefrighthw
-libmm-venc-inc      += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-venc-inc      += $(TARGET_OUT_HEADERS)/adreno
-libmm-venc-inc      += frameworks/native/include/media/hardware
-libmm-venc-inc      += frameworks/native/include/media/openmax
-libmm-venc-inc      += hardware/qcom/media/libc2dcolorconvert
-libmm-venc-inc      += frameworks/av/include/media/stagefright
-libmm-venc-inc      += $(venc-inc)
+
 libmm-venc-inc      += $(TARGET_OUT_HEADERS)/mm-video/swVenc
 
 LOCAL_MODULE                    := libOmxSwVencHevc
 LOCAL_MODULE_TAGS               := optional
 LOCAL_CFLAGS                    := $(libmm-venc-def)
 LOCAL_C_INCLUDES                := $(libmm-venc-inc)
+LOCAL_ADDITIONAL_DEPENDENCIES   := $(libmm-venc-add-dep)
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils \
                              libc2dcolorconvert libdl libgui
-LOCAL_SHARED_LIBRARIES  += libHevcSwEncoder
+LOCAL_SHARED_LIBRARIES    += libHevcSwEncoder
+LOCAL_STATIC_LIBRARIES    := libOmxVidcCommon
 
 LOCAL_SRC_FILES   := src/omx_video_base.cpp
 LOCAL_SRC_FILES   += src/omx_swvenc_hevc.cpp
-LOCAL_SRC_FILES   += ../common/src/extra_data_handler.cpp
-LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 include $(BUILD_SHARED_LIBRARY)
 endif
 
-endif #BUILD_TINY_ANDROID
-
 # ---------------------------------------------------------------------------------
 # 					END
 # ---------------------------------------------------------------------------------
-
diff --git a/videopp/Android.mk b/videopp/Android.mk
index 9928407c..43440fdf 100644
--- a/videopp/Android.mk
+++ b/videopp/Android.mk
@@ -24,11 +24,8 @@ libOmxVdpp-def += -DENABLE_DEBUG_ERROR
 libOmxVdpp-def += -D_ANDROID_ICS_
 libOmxVdpp-def += -UINPUT_BUFFER_LOG
 libOmxVdpp-def += -UOUTPUT_BUFFER_LOG
-
-ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
 libOmxVdpp-def += -DMAX_RES_1080P
 libOmxVdpp-def += -DMAX_RES_1080P_EBI
-endif
 
 ifeq ($(TARGET_USES_ION),true)
 libOmxVdpp-def += -DUSE_ION