diff --git a/Android.bp b/Android.bp index aac0ef0..c6b3bc1 100644 --- a/Android.bp +++ b/Android.bp @@ -1784,153 +1784,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libGLES_meow", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/egl/libGLES_meow.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libnativewindow", - "libhidlbase", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "egl", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libMEOW_data", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/egl/libMEOW_data.so", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "egl", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libMEOW_gift", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/egl/libMEOW_gift.so", - ], - shared_libs: [ - "libFrameRecord", - "libDefaultFpsActor", - "libNoFpsActor", - "libnativewindow", - "libutilscallstack", - "libcutils", - "libutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "egl", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libMEOW_qt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/egl/libMEOW_qt.so", - ], - shared_libs: [ - "libutils", - "libcutils", - "liblog", - "libnativewindow", - "libhidlbase", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "egl", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libMEOW_trace", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/egl/libMEOW_trace.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libnativewindow", - "libGLES_meow", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "egl", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libGLES_mali", owner: "xiaomi", @@ -3167,7 +3020,7 @@ cc_prebuilt_library_shared { "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", - "libtinyxml2", + "libtinyxml2-v34", "libjsoncpp", "libdrm", "libbinder", @@ -7771,60 +7624,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libDefaultFpsActor", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libDefaultFpsActor.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libFrameRecord", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libFrameRecord.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libJpgEncPipe", owner: "xiaomi", @@ -7907,33 +7706,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libNoFpsActor", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libNoFpsActor.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libOpenCL", owner: "xiaomi", @@ -11126,33 +10898,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmisoundcrossfade", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libmisoundcrossfade.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmmagent", owner: "xiaomi", @@ -28478,183 +28223,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libaudiotoolkit", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libaudiotoolkit.so", - ], - shared_libs: [ - "liblog", - "libcutils", - "libutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libem_aoltest_jni", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libem_aoltest_jni.so", - ], - shared_libs: [ - "libnativehelper", - "libandroid_runtime", - "libutils", - "libui", - "libcutils", - "liblog", - "libnl", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libem_audio_jni", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libem_audio_jni.so", - ], - shared_libs: [ - "libnativehelper", - "libandroid_runtime", - "libutils", - "libui", - "libcutils", - "libaudioclient", - "liblog", - "libaudiotoolkit", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libem_bleoffload_jni", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libem_bleoffload_jni.so", - ], - shared_libs: [ - "libnativehelper", - "libandroid_runtime", - "libutils", - "libui", - "libcutils", - "liblog", - "libnl", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libem_support_jni", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libem_support_jni.so", - ], - shared_libs: [ - "libandroid_runtime", - "liblog", - "libutils", - "libgui", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libem_wifi_jni", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libem_wifi_jni.so", - ], - shared_libs: [ - "libandroid_runtime", - "libui", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - android_app_import { name: "JVFactoryTest_O7", owner: "xiaomi", @@ -28677,17 +28245,6 @@ android_app_import { soc_specific: true, } -android_app_import { - name: "EngineerMode", - owner: "xiaomi", - apk: "proprietary/system_ext/app/EngineerMode/EngineerMode.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - system_ext_specific: true, -} - prebuilt_etc_xml { name: "android.hardware.neuralnetworks-shim-service-mtk.xml", owner: "xiaomi", diff --git a/proprietary/system_ext/app/EngineerMode/EngineerMode.apk b/proprietary/system_ext/app/EngineerMode/EngineerMode.apk deleted file mode 100644 index e5df392..0000000 Binary files a/proprietary/system_ext/app/EngineerMode/EngineerMode.apk and /dev/null differ diff --git a/proprietary/system_ext/lib64/libaudiotoolkit.so b/proprietary/system_ext/lib64/libaudiotoolkit.so deleted file mode 100644 index 1502873..0000000 Binary files a/proprietary/system_ext/lib64/libaudiotoolkit.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libem_aoltest_jni.so b/proprietary/system_ext/lib64/libem_aoltest_jni.so deleted file mode 100644 index aaf187c..0000000 Binary files a/proprietary/system_ext/lib64/libem_aoltest_jni.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libem_audio_jni.so b/proprietary/system_ext/lib64/libem_audio_jni.so deleted file mode 100644 index a9df02a..0000000 Binary files a/proprietary/system_ext/lib64/libem_audio_jni.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libem_bleoffload_jni.so b/proprietary/system_ext/lib64/libem_bleoffload_jni.so deleted file mode 100644 index 8edc0ae..0000000 Binary files a/proprietary/system_ext/lib64/libem_bleoffload_jni.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libem_support_jni.so b/proprietary/system_ext/lib64/libem_support_jni.so deleted file mode 100644 index 8d8c533..0000000 Binary files a/proprietary/system_ext/lib64/libem_support_jni.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libem_wifi_jni.so b/proprietary/system_ext/lib64/libem_wifi_jni.so deleted file mode 100644 index a487af7..0000000 Binary files a/proprietary/system_ext/lib64/libem_wifi_jni.so and /dev/null differ diff --git a/proprietary/vendor/lib64/egl/libGLES_meow.so b/proprietary/vendor/lib64/egl/libGLES_meow.so deleted file mode 100644 index 38381e4..0000000 Binary files a/proprietary/vendor/lib64/egl/libGLES_meow.so and /dev/null differ diff --git a/proprietary/vendor/lib64/egl/libMEOW_data.so b/proprietary/vendor/lib64/egl/libMEOW_data.so deleted file mode 100644 index b5f8126..0000000 Binary files a/proprietary/vendor/lib64/egl/libMEOW_data.so and /dev/null differ diff --git a/proprietary/vendor/lib64/egl/libMEOW_gift.so b/proprietary/vendor/lib64/egl/libMEOW_gift.so deleted file mode 100644 index 13c8fc5..0000000 Binary files a/proprietary/vendor/lib64/egl/libMEOW_gift.so and /dev/null differ diff --git a/proprietary/vendor/lib64/egl/libMEOW_qt.so b/proprietary/vendor/lib64/egl/libMEOW_qt.so deleted file mode 100644 index 1a2b567..0000000 Binary files a/proprietary/vendor/lib64/egl/libMEOW_qt.so and /dev/null differ diff --git a/proprietary/vendor/lib64/egl/libMEOW_trace.so b/proprietary/vendor/lib64/egl/libMEOW_trace.so deleted file mode 100644 index f1cfd1d..0000000 Binary files a/proprietary/vendor/lib64/egl/libMEOW_trace.so and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so index 7057448..d3d5d98 100644 Binary files a/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so differ diff --git a/proprietary/vendor/lib64/libDefaultFpsActor.so b/proprietary/vendor/lib64/libDefaultFpsActor.so deleted file mode 100644 index d4f5ec4..0000000 Binary files a/proprietary/vendor/lib64/libDefaultFpsActor.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libFrameRecord.so b/proprietary/vendor/lib64/libFrameRecord.so deleted file mode 100644 index c8e9955..0000000 Binary files a/proprietary/vendor/lib64/libFrameRecord.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libNoFpsActor.so b/proprietary/vendor/lib64/libNoFpsActor.so deleted file mode 100644 index d02f466..0000000 Binary files a/proprietary/vendor/lib64/libNoFpsActor.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libmisoundcrossfade.so b/proprietary/vendor/lib64/libmisoundcrossfade.so deleted file mode 100644 index 9fdcfb5..0000000 Binary files a/proprietary/vendor/lib64/libmisoundcrossfade.so and /dev/null differ diff --git a/tanzanite-vendor.mk b/tanzanite-vendor.mk index 19d63a8..59c8d3f 100644 --- a/tanzanite-vendor.mk +++ b/tanzanite-vendor.mk @@ -763,11 +763,6 @@ PRODUCT_PACKAGES += \ com.xiaomi.plugin.superlowlight \ com.xiaomi.plugin.swflip \ com.xiaomi.plugin.yuvfullhdr \ - libGLES_meow \ - libMEOW_data \ - libMEOW_gift \ - libMEOW_qt \ - libMEOW_trace \ libGLES_mali \ hq_algoutils \ android.hardware.gnss-impl-mediatek \ @@ -991,12 +986,9 @@ PRODUCT_PACKAGES += \ libCamera_sc202vtrulymacromipiraw_Scene_Preview_ZSD_Flash \ libCamera_sc202vtrulymacromipiraw_Video_1080 \ libCamera_sc202vtrulymacromipiraw_Video_4k \ - libDefaultFpsActor \ - libFrameRecord \ libJpgEncPipe \ libMiVideoFilter \ libMtkSpeechEnh \ - libNoFpsActor \ libOpenCL \ libSQLiteModule_VER_ALL \ libTEECommon \ @@ -1109,7 +1101,6 @@ PRODUCT_PACKAGES += \ libminiui \ libmipc \ libmisight \ - libmisoundcrossfade \ libmmagent \ libmml \ libmnetlink_v104 \ @@ -1682,15 +1673,8 @@ PRODUCT_PACKAGES += \ vendor.mediatek.hardware.videotelephony@1.0_vendor \ vendor.xiaomi.sensor.citsensorservice@1.1 \ vendor.xiaomi.sensor.citsensorservice@2.0 \ - libaudiotoolkit \ - libem_aoltest_jni \ - libem_audio_jni \ - libem_bleoffload_jni \ - libem_support_jni \ - libem_wifi_jni \ JVFactoryTest_O7 \ goodix_sz_miui \ - EngineerMode \ android.hardware.neuralnetworks-shim-service-mtk.xml \ android.hardware.security.keymint-service.mitee.xml \ android.hardware.security.secureclock-service.mitee.xml \