From ec768a0c76227f8dfebf59d212782a22db9754ec Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Fri, 28 Jun 2024 22:09:34 -0500 Subject: [PATCH] dre: Remove software omx codec references These are no longer available as of Android 14 QPR3. The C2 codecs available by default in the swcodec apex will be used instead. Change-Id: I8cdf3e700823779a7382c66c3df8410d41209b7c --- device.mk | 6 +----- extract-files.sh | 4 ++++ proprietary-files.txt | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/device.mk b/device.mk index 3b0c233..364a046 100644 --- a/device.mk +++ b/device.mk @@ -293,13 +293,9 @@ 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_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ 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 \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.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 += \ diff --git a/extract-files.sh b/extract-files.sh index 2367380..a0182ca 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -87,6 +87,10 @@ function blob_fixup() { [ "$2" = "" ] && return 0 sed -i "s/NFC_DEBUG_ENABLED=1/NFC_DEBUG_ENABLED=0/" "${2}" ;; + 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}" + ;; vendor/lib64/hw/com.qti.chi.override.so) [ "$2" = "" ] && return 0 grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}" diff --git a/proprietary-files.txt b/proprietary-files.txt index 4d66afb..19bbf65 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1237,7 +1237,6 @@ vendor/etc/media_codecs_holi_vendor.xml vendor/etc/media_codecs_performance.xml vendor/etc/media_codecs_performance_holi.xml vendor/etc/media_codecs_performance_holi_vendor.xml -vendor/etc/media_codecs_vendor_audio.xml vendor/etc/media_profiles.xml vendor/etc/media_profiles_V1_0.xml vendor/etc/media_profiles_holi.xml