media: Allow using different files for GSI and non-GSI [2/2]
* AOSP now adds support for using customized media XML files via sysprops.
* Add this support to use different files for GSI and non-GSI builds.
* The properties are added to system partition so that they get reset
and fallback to AOSP defaults when GSI is flashed.
Change-Id: I6d51c3ac8a5327d92b54d506a972d358b4c96028
diff --git a/device.mk b/device.mk
index eb99453..3ba00a1 100644
--- a/device.mk
+++ b/device.mk
@@ -709,14 +709,24 @@
TARGET_USES_MEDIA_EXTENSIONS := true
-# media_profiles and media_codecs xmls for msm8953
+#
+# media profiles and media codecs xmls
+#
+# We select non-default xmls in system partition with the properties.
+PRODUCT_SYSTEM_PROPERTIES += \
+ ro.media.xml_variant.codecs=_vendor \
+ ro.media.xml_variant.profiles=_8953_v1
+
+PRODUCT_COPY_FILES += \
+ $(FP_PATH)/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \
+ $(FP_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
+ $(FP_PATH)/media/media_profiles_8953_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_8953_v1.xml
+
+# media files for GSI - using default paths
PRODUCT_COPY_FILES += \
$(FP_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
- $(FP_PATH)/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \
$(FP_PATH)/media/media_codecs_performance_8953.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
- $(FP_PATH)/media/media_profiles_8953_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_8953_v1.xml \
- $(FP_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
- $(FP_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
+ $(FP_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
PRODUCT_COPY_FILES += \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \