Fixup media profiles variant
Adjust to the one we're actually using in Android 11 -- in source we're
now using the same file name again to avoid confusion when comparing the
Android versions.
Drop the new 'ro.media.xml_variant.profiles' property and keep using
'media.settings.xml' (defined in system.prop), to keep the setup
consistent with Android 11.
Issue: FP3-A11#422
Change-Id: I7307aaa2c809457601e21644029e1d2e51f5a7b9
Depends-On: Ia2f480e3f8d56496d93a82610ea6b9a596d1ae5f
diff --git a/device.mk b/device.mk
index 06e5740..f078499 100644
--- a/device.mk
+++ b/device.mk
@@ -741,13 +741,12 @@
#
# 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
+ ro.media.xml_variant.codecs=_vendor
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
+ $(FP_PATH)/media/media_profiles_8953.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
# media files for GSI - using default paths
PRODUCT_COPY_FILES += \