Merge d4fd44993ecac4a2409a69b056df822120d59c46 on remote branch
Change-Id: Ie81a7ae666f6f03fefcacecddc4b1e40c9d54bea
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 2c6f83e..77e7edd 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -61,7 +61,7 @@
LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp
LOCAL_SRC_FILES += src/common/qc_omx_core.c
-ifneq (,$(filter lito kona lahaina holi $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter lito kona lahaina holi $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES += src/registry_table_android.c
else
LOCAL_SRC_FILES += src/default/qc_registry_table_android.c
@@ -102,7 +102,7 @@
LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp
LOCAL_SRC_FILES += src/common/qc_omx_core.c
-ifneq (,$(filter lito kona lahaina holi $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter lito kona lahaina holi $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table.c
else
LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/default/qc_registry_table.c
diff --git a/product.mk b/product.mk
index 790e016..0ad03fa 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, crow blair bengal neo parrot taro lahaina holi kona), true)
+ifeq ($(call is-board-platform-in-list, crow blair bengal neo parrot taro lahaina holi kona trinket), true)
$(warning "Default Codec2.0 Enabled")
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.ccodec=4
endif