summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamesh Kodam <rameko@codeaurora.org>2020-05-14 23:34:53 -0700
committerRamesh Kodam <rameko@codeaurora.org>2020-05-21 19:14:43 -0700
commitb46967b52ac7d2dfec224190cdc62cdbd8b81ecd (patch)
tree113f0d34719281f221846cb6bcbd867bec78a779
parentbf67a79ffa0b971005ae41ed050902a18836b3a9 (diff)
sm6150_au,sdmshrike_au : Copy correct media_profiles xml
Copy correct media_profiles xml based on TARGET_BOARD_AUTO flag. Change-Id: I7c6ec42683b480b3957fe1f70735e691b9348b95
-rw-r--r--conf_files/sm6150/sm6150.mk8
-rw-r--r--product.mk2
2 files changed, 9 insertions, 1 deletions
diff --git a/conf_files/sm6150/sm6150.mk b/conf_files/sm6150/sm6150.mk
index 547951e8..565f61a3 100644
--- a/conf_files/sm6150/sm6150.mk
+++ b/conf_files/sm6150/sm6150.mk
@@ -40,7 +40,7 @@ ifeq ($(GENERIC_ODM_IMAGE),true)
PRODUCT_COPY_FILES += \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
-else
+else ifneq ($(TARGET_FWK_SUPPORTS_AV_VALUEADDS),false)
$(warning "Enabling codec2.0 SW only for non-generic odm build variant")
DEVICE_MANIFEST_FILE += hardware/qcom/media/conf_files/sm6150/c2_manifest.xml
#Rank OMX SW codecs lower than OMX HW codecs
@@ -50,4 +50,10 @@ else
PRODUCT_COPY_FILES += \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \
$(CONFIG_PATH)/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
+else
+ $(warning "Compiling without value-added features")
+ DEVICE_MANIFEST_FILE += hardware/qcom/media/conf_files/msmnile/c2_manifest.xml
+ PRODUCT_COPY_FILES += \
+ device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \
+ device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
endif
diff --git a/product.mk b/product.mk
index 319290b3..ddffee39 100644
--- a/product.mk
+++ b/product.mk
@@ -24,6 +24,8 @@ PRODUCT_PACKAGES += $(MM_VIDEO)
ifeq ($(call is-board-platform-in-list, msmnile $(MSMSTEPPE) atoll $(TRINKET)),true)
include hardware/qcom/media/conf_files/$(TARGET_BOARD_PLATFORM)/$(TARGET_BOARD_PLATFORM).mk
+else ifeq ($(TARGET_BOARD_PLATFORM), sdmshrike)
+include hardware/qcom/media/conf_files/msmnile/msmnile.mk
endif
endif