rosemary: Link media.c2 service against v33 libstagefright_foundation

* Fixes crashes and high CPU usage

Change-Id: I60c07d10c2db9335d20c6dbaaaeacc9313aebf06
Signed-off-by: Woomymy <woomy@woomy.be>
This commit is contained in:
Woomymy
2023-11-29 12:48:16 +01:00
committed by Matsvei Niaverau
parent e5a6a37a87
commit ef9c77c1f9
3 changed files with 21 additions and 0 deletions

View File

@@ -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/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 $(LOCAL_PATH)/configs/seccomp/mediaswcodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaswcodec.policy
PRODUCT_PACKAGES += \
libstagefright_foundation-v33
# Neural Networks # Neural Networks
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.neuralnetworks@1.0.vendor \ android.hardware.neuralnetworks@1.0.vendor \

View File

@@ -66,6 +66,11 @@ function blob_fixup {
vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so) 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" "$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) 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}" "${PATCHELF}" --replace-needed "android.hardware.power-V2-ndk_platform.so" "android.hardware.power-V2-ndk.so" "${2}"
;; ;;

View File

@@ -36,3 +36,16 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CHECK_ELF_FILES := false LOCAL_CHECK_ELF_FILES := false
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
include $(BUILD_PREBUILT) 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)