Merge tag 'LA.VENDOR.13.2.0.r1-21400-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/media into lineage-21.0-caf-sm8550
LA.VENDOR.13.2.0.r1-21400-KAILUA.0
* tag 'LA.VENDOR.13.2.0.r1-21400-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/media:
mm-core: Add trinket to the list of targets supporting OMX
media: trinket: Enable codec2
Change-Id: I2f67bf55622bb0f2c73432e4839199050d4637fa
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 7bfca99..8c0086a 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -59,7 +59,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
@@ -100,7 +100,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 58b7b52..d94af21 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_VENDOR_PROPERTIES += debug.stagefright.ccodec=4
endif