From 1e9e2a9ea6a81cd56c1307711f700c17e43ed85c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 8 Jul 2024 08:56:25 +0300 Subject: [PATCH] dre: Remove media_codecs_google_c2* AOSP codecs can be used by default and it is not necessary to include them device side. Change-Id: I8227b06f0466b614f12fa9008402b92461ea3dd0 --- device.mk | 6 ------ extract-files.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/device.mk b/device.mk index 364a046..d5279ae 100644 --- a/device.mk +++ b/device.mk @@ -292,12 +292,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml -PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml - - PRODUCT_PACKAGES += \ libavservices_minijail \ libavservices_minijail.vendor \ diff --git a/extract-files.sh b/extract-files.sh index a0182ca..e7cb068 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -89,7 +89,7 @@ function blob_fixup() { ;; vendor/etc/media_codecs.xml|vendor/etc/media_codecs_holi.xml|vendor/etc/media_codecs_holi_vendor.xml) [ "$2" = "" ] && return 0 - sed -Ei "/media_codecs_(google_audio|google_telephony|vendor_audio)/d" "${2}" + sed -Ei "/media_codecs_(google_audio|google_c2|google_telephony|vendor_audio)/d" "${2}" ;; vendor/lib64/hw/com.qti.chi.override.so) [ "$2" = "" ] && return 0