diff --git a/common.mk b/common.mk index e5095f2..b48fdb6 100644 --- a/common.mk +++ b/common.mk @@ -267,9 +267,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/lahaina/media_codecs_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ - $(LOCAL_PATH)/media/lahaina/media_codecs_performance_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ - $(LOCAL_PATH)/media/lahaina/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml + $(LOCAL_PATH)/media/lahaina/media_codecs_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ + $(LOCAL_PATH)/media/lahaina/media_codecs_performance_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ + $(LOCAL_PATH)/media/lahaina/media_profiles_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media/yupik/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \ diff --git a/media/lahaina/media_codecs_lahaina.xml b/media/lahaina/media_codecs_lahaina.xml deleted file mode 100644 index c6592ed..0000000 --- a/media/lahaina/media_codecs_lahaina.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - diff --git a/media/lahaina/media_codecs_lahaina_vendor.xml b/media/lahaina/media_codecs_lahaina_vendor.xml new file mode 100644 index 0000000..e4cc2f4 --- /dev/null +++ b/media/lahaina/media_codecs_lahaina_vendor.xml @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/lahaina/media_codecs_performance_lahaina.xml b/media/lahaina/media_codecs_performance_lahaina_vendor.xml similarity index 94% rename from media/lahaina/media_codecs_performance_lahaina.xml rename to media/lahaina/media_codecs_performance_lahaina_vendor.xml index f77e0d5..f52cff3 100644 --- a/media/lahaina/media_codecs_performance_lahaina.xml +++ b/media/lahaina/media_codecs_performance_lahaina_vendor.xml @@ -26,7 +26,7 @@ - + @@ -40,13 +40,12 @@ - + - @@ -67,7 +66,7 @@ - + @@ -101,6 +100,8 @@ + + @@ -132,7 +133,7 @@ - + @@ -144,7 +145,7 @@ - + diff --git a/media/lahaina/media_profiles_lahaina.xml b/media/lahaina/media_profiles_lahaina_vendor.xml similarity index 100% rename from media/lahaina/media_profiles_lahaina.xml rename to media/lahaina/media_profiles_lahaina_vendor.xml