diff --git a/Android.bp b/Android.bp index 4ef4299..3669b4b 100644 --- a/Android.bp +++ b/Android.bp @@ -2030,7 +2030,6 @@ cc_prebuilt_library_shared { shared_libs: ["libhidlbase", "vendor.mediatek.hardware.mtkpower@1.0", "liblog", "libcutils", "libutils", "libalsautils-v30", "libhardware_legacy", "libhardware", "libaudioutils", "libtinyalsa", "libtinyxml", "libaudiotoolkit_vendor", "libmedia_helper-v30", "libladder", "android.hardware.audio@6.0", "android.hardware.audio.common-util", "android.hardware.audio.common@6.0", "android.hardware.audio.common@6.0-util", "vendor.mediatek.hardware.audio@6.1", "libaudio_engineer_test", "libtinycompress", "libaedv", "libktveffect", "libktvreverb", "libktvsoundtouch", "libktvdrc", "libktveq", "libktvvolume", "libktveffect_rec", "libktvns", "liboplus_audio_config", "libc++", "libc", "libm", "libdl", ], }, }, - check_elf_files: false, compile_multilib: "32", relative_install_path: "hw", prefer: true, @@ -13138,7 +13137,6 @@ cc_prebuilt_library_shared { shared_libs: ["liblog", "libutils-v30", "libcutils", "libsync", "libladder", "libmtkcam_ulog", "libaedv", "libhidlbase", "android.hidl.allocator@1.0", "android.hardware.graphics.mapper@2.0", "android.hidl.memory@1.0", "libhidlmemory", "libhidltransport", "android.hardware.camera.common@1.0", "vendor.mediatek.hardware.camera.camdump@1.0", "libc++", "libc", "libm", "libdl", ], }, }, - check_elf_files: false, compile_multilib: "64", prefer: true, soc_specific: true, @@ -14690,10 +14688,10 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/system_ext/lib64/libimsma.so"], + shared_libs: ["libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libui", "libutils", "libsink-mtk", "libsource", "libvcodec_cap", "libimsma_rtp", "libcomutils", "liblog", "libsignal", "libnetd_client", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", - check_elf_files: false, prefer: true, system_ext_specific: true, } @@ -14801,14 +14799,14 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libsink", + name: "libsink-mtk", owner: "realme", strip: { none: true, }, target: { android_arm64: { - srcs: ["proprietary/system_ext/lib64/libsink.so"], + srcs: ["proprietary/system_ext/lib64/libsink-mtk.so"], shared_libs: ["libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libui", "libutils", "libcomutils", "libvcodec_cap", "libvt_avsync", "liblog", "libmedia_omx", "libaudioclient", "libc++", "libc", "libm", "libdl", ], }, }, @@ -15703,7 +15701,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"], - shared_libs: ["libmtkrillog", "libmtkproperty", "libmtkcutils", "librilfusion", "libmtkrilutils", "libsysenv", "libmtkconfigutils", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libutils-v32", "libmtkrillog", "libmtkproperty", "libmtkcutils", "librilfusion", "libmtkrilutils", "libsysenv", "libmtkconfigutils", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/Android.mk b/Android.mk index dd6463d..3b2a42f 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter RM6785,$(TARGET_DEVICE)),) +ifeq ($(TARGET_DEVICE),RM6785) $(call add-radio-file-sha1-checked,radio/audio_dsp.img,2d87067c80e59eb7c628fb227a11e7fb28d7d5ff) $(call add-radio-file-sha1-checked,radio/cam_vpu1.img,8e4a8148966803847444f93c4ddcd2068e495382) diff --git a/RM6785-vendor.mk b/RM6785-vendor.mk index 9031d5e..a26d4ed 100644 --- a/RM6785-vendor.mk +++ b/RM6785-vendor.mk @@ -583,7 +583,6 @@ PRODUCT_COPY_FILES += \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_audio.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.xml \ - vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ vendor/realme/RM6785/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ vendor/realme/RM6785/proprietary/vendor/etc/mtk_omx_core.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mtk_omx_core.cfg \ @@ -1640,7 +1639,7 @@ PRODUCT_PACKAGES += \ libmtk_vt_service \ libmtk_vt_wrapper \ libsignal \ - libsink \ + libsink-mtk \ libsource \ libvcodec_cap \ libvcodec_capenc \ diff --git a/proprietary/system_ext/lib64/libimsma.so b/proprietary/system_ext/lib64/libimsma.so index e53bcfa..7142314 100644 Binary files a/proprietary/system_ext/lib64/libimsma.so and b/proprietary/system_ext/lib64/libimsma.so differ diff --git a/proprietary/system_ext/lib64/libsink.so b/proprietary/system_ext/lib64/libsink-mtk.so similarity index 83% rename from proprietary/system_ext/lib64/libsink.so rename to proprietary/system_ext/lib64/libsink-mtk.so index 070c6b0..9357e04 100644 Binary files a/proprietary/system_ext/lib64/libsink.so and b/proprietary/system_ext/lib64/libsink-mtk.so differ diff --git a/proprietary/vendor/bin/hw/mtkfusionrild b/proprietary/vendor/bin/hw/mtkfusionrild index af347b2..e6844f0 100644 Binary files a/proprietary/vendor/bin/hw/mtkfusionrild and b/proprietary/vendor/bin/hw/mtkfusionrild differ diff --git a/proprietary/vendor/etc/media_codecs_performance.xml b/proprietary/vendor/etc/media_codecs_performance.xml deleted file mode 100644 index 5d31e36..0000000 --- a/proprietary/vendor/etc/media_codecs_performance.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -