diff options
| author | Santhosh Behara <santhoshbehara@codeaurora.org> | 2020-04-08 10:46:14 +0530 |
|---|---|---|
| committer | Santhosh Behara <santhoshbehara@codeaurora.org> | 2020-04-08 10:46:14 +0530 |
| commit | 565ec7bf43f34feb55b125b9a8db5ed42866f493 (patch) | |
| tree | 6b85d1f6b767fb8e055cd9db398825144d0610ec | |
| parent | 967cdb30e6c36b545f3865887ba1e8a5808f3094 (diff) | |
| download | media-565ec7bf43f34feb55b125b9a8db5ed42866f493.tar.gz | |
conf_files: sm6150: Copy the right media profiles xml
Copy the right media_profiles.xml based on the GENERIC_ODM_IMAGE
flag
Change-Id: I5cd95ed7b9e7ef5ef0b1bf521aca6f6947fa9da0
| -rw-r--r-- | conf_files/sm6150/sm6150.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/conf_files/sm6150/sm6150.mk b/conf_files/sm6150/sm6150.mk index 9872d920..547951e8 100644 --- a/conf_files/sm6150/sm6150.mk +++ b/conf_files/sm6150/sm6150.mk @@ -15,7 +15,6 @@ PRODUCT_COPY_FILES += \ $(CONFIG_PATH)/media_codecs_vendor_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_v2.xml \ $(CONFIG_PATH)/media_codecs_performance_sdmmagpie_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_v1.xml \ $(CONFIG_PATH)/media_codecs_performance_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_v2.xml \ - $(CONFIG_PATH)/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ $(CONFIG_PATH)/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ $(CONFIG_PATH)/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml @@ -39,7 +38,8 @@ ifeq ($(GENERIC_ODM_IMAGE),true) PRODUCT_ODM_PROPERTIES += debug.stagefright.ccodec=4 PRODUCT_ODM_PROPERTIES += debug.stagefright.omx_default_rank=1000 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_ODM)/etc/media_profiles_V1_0.xml \ + device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml else $(warning "Enabling codec2.0 SW only for non-generic odm build variant") DEVICE_MANIFEST_FILE += hardware/qcom/media/conf_files/sm6150/c2_manifest.xml @@ -48,5 +48,6 @@ else PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0 PRODUCT_PROPERTY_OVERRIDES += media.settings.xml=/vendor/etc/media_profiles_vendor.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_ODM)/etc/media_profiles_V1_0.xml \ + $(CONFIG_PATH)/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml endif |