From 3bbef601aecd95b54594211b871db00a21f99577 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 22 Aug 2024 22:26:16 -0300 Subject: [PATCH] sm8550-common: 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 --- common.mk | 5 ----- extract-files.sh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common.mk b/common.mk index 17086a8..048162d 100644 --- a/common.mk +++ b/common.mk @@ -271,11 +271,6 @@ PRODUCT_PACKAGES += \ libcodec2_vndk.vendor \ libpalclient -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_COPY_FILES += \ $(AUDIO_HAL_DIR)/configs/common/codec2/media_codecs_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2_audio.xml \ $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.base-arm.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.base-arm.policy \ diff --git a/extract-files.sh b/extract-files.sh index 50cd5e6..4d00f5b 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -76,7 +76,7 @@ function blob_fixup() { sed -i 's/default0/software/g' "${2}" ;; vendor/etc/media_codecs_kalama.xml|vendor/etc/media_codecs_kalama_vendor.xml) - sed -Ei "/media_codecs_(google_audio|google_telephony|google_video|vendor_audio)/d" "${2}" + sed -Ei "/media_codecs_(google_audio|google_c2|google_telephony|google_video|vendor_audio)/d" "${2}" ;; vendor/etc/seccomp_policy/qwesd@2.0.policy) echo "pipe2: 1" >> "${2}"