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
This commit is contained in:
Aaron Kling 2024-06-28 22:09:34 -05:00 committed by Albert Tang
parent 9f85aa4e46
commit ec768a0c76
3 changed files with 5 additions and 6 deletions

View file

@ -293,13 +293,9 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml $(LOCAL_PATH)/configs/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
PRODUCT_COPY_FILES += \ 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.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_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_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
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View file

@ -87,6 +87,10 @@ function blob_fixup() {
[ "$2" = "" ] && return 0 [ "$2" = "" ] && return 0
sed -i "s/NFC_DEBUG_ENABLED=1/NFC_DEBUG_ENABLED=0/" "${2}" 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) vendor/lib64/hw/com.qti.chi.override.so)
[ "$2" = "" ] && return 0 [ "$2" = "" ] && return 0
grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}" grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}"

View file

@ -1237,7 +1237,6 @@ vendor/etc/media_codecs_holi_vendor.xml
vendor/etc/media_codecs_performance.xml vendor/etc/media_codecs_performance.xml
vendor/etc/media_codecs_performance_holi.xml vendor/etc/media_codecs_performance_holi.xml
vendor/etc/media_codecs_performance_holi_vendor.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.xml
vendor/etc/media_profiles_V1_0.xml vendor/etc/media_profiles_V1_0.xml
vendor/etc/media_profiles_holi.xml vendor/etc/media_profiles_holi.xml