From ef9c77c1f9e90c49b19fcd16158821eea09a1b61 Mon Sep 17 00:00:00 2001 From: Woomymy Date: Wed, 29 Nov 2023 12:48:16 +0100 Subject: [PATCH] rosemary: Link media.c2 service against v33 `libstagefright_foundation` * Fixes crashes and high CPU usage Change-Id: I60c07d10c2db9335d20c6dbaaaeacc9313aebf06 Signed-off-by: Woomymy --- device.mk | 3 +++ extract-files.sh | 5 +++++ vndk/Android.mk | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/device.mk b/device.mk index bd62758..3fc722b 100644 --- a/device.mk +++ b/device.mk @@ -274,6 +274,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/seccomp/mediaextractor.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy \ $(LOCAL_PATH)/configs/seccomp/mediaswcodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaswcodec.policy +PRODUCT_PACKAGES += \ + libstagefright_foundation-v33 + # Neural Networks PRODUCT_PACKAGES += \ android.hardware.neuralnetworks@1.0.vendor \ diff --git a/extract-files.sh b/extract-files.sh index dfa44f1..2dc66dc 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -66,6 +66,11 @@ function blob_fixup { vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so) "$PATCHELF" --replace-needed "android.hardware.gnss-V1-ndk_platform.so" "android.hardware.gnss-V1-ndk.so" "$2" ;; + vendor/bin/hw/android.hardware.media.c2@1.2-mediatek) + ;& + vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b) + "${PATCHELF}" --add-needed "libstagefright_foundation-v33.so" "${2}" + ;; vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service) "${PATCHELF}" --replace-needed "android.hardware.power-V2-ndk_platform.so" "android.hardware.power-V2-ndk.so" "${2}" ;; diff --git a/vndk/Android.mk b/vndk/Android.mk index 3868966..6d04cce 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -36,3 +36,16 @@ LOCAL_MODULE_TAGS := optional LOCAL_CHECK_ELF_FILES := false LOCAL_VENDOR_MODULE := true include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libstagefright_foundation-v33 +LOCAL_MULTILIB := both +LOCAL_SRC_FILES_arm := v33/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_foundation.so +LOCAL_SRC_FILES_arm64 := v33/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_foundation.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_TARGET_ARCH := arm arm64 +LOCAL_MODULE_TAGS := optional +LOCAL_CHECK_ELF_FILES := false +LOCAL_VENDOR_MODULE := true +include $(BUILD_PREBUILT)