Merge cae17bbc52f505b5d09b4dd36ce3e74b21e245a8 on remote branch
Change-Id: I4726b5f3360802a2f6a59242e21c7daa90120302
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index c8a114d..e0aed81 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -12,6 +12,8 @@
OMXCORE_CFLAGS += -DVIDC_STUB_HAL
endif
+QCOM_MEDIA_ROOT ?= hardware/qcom/media
+
#===============================================================================
# Figure out the targets
#===============================================================================
@@ -33,7 +35,7 @@
#===============================================================================
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig
+LOCAL_C_INCLUDES += $(TOP)/$(QCOM_MEDIA_ROOT)/libplatformconfig
LOCAL_HEADER_LIBRARIES := \
libutils_headers \
@@ -74,7 +76,7 @@
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig
+LOCAL_C_INCLUDES += $(TOP)/$(QCOM_MEDIA_ROOT)/libplatformconfig
LOCAL_HEADER_LIBRARIES := \
libutils_headers \
diff --git a/product.mk b/product.mk
index d71ee00..26408e4 100644
--- a/product.mk
+++ b/product.mk
@@ -13,7 +13,7 @@
#---------------------------------------------------------------------------------------------------
# TODO(PC): Override ccodec selection option back to defult (4).
# QSSI is forcing this to '1'. Must be reverted
-ifeq ($(call is-board-platform-in-list, parrot taro lahaina holi), true)
+ifeq ($(call is-board-platform-in-list, bengal neo parrot taro lahaina holi), true)
$(warning "Default Codec2.0 Enabled")
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.ccodec=4
endif