diff --git a/Android.bp b/Android.bp index 187c492..6adfe8d 100644 --- a/Android.bp +++ b/Android.bp @@ -28403,506 +28403,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcomutils", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libcomutils.so", - ], - shared_libs: [ - "libcutils", - "libstagefright_foundation", - "libutils", - "libstagefright", - "libmedia", - "liblog", - "libhidlbase", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libimsma", - owner: "xiaomi", - strip: { - none: true, - }, - 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", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libimsma_adapt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libimsma_adapt.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libimsma_rtp", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libimsma_rtp.so", - ], - shared_libs: [ - "libbinder", - "libmedia", - "libutils", - "libcutils", - "libstagefright", - "libstagefright_foundation", - "libimsma_socketwrapper", - "libvcodec_cap", - "libimsma_adapt", - "liblog", - "libsignal", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libimsma_socketwrapper", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libimsma_socketwrapper.so", - ], - shared_libs: [ - "libbinder", - "libmedia", - "libutils", - "libcutils", - "libstagefright", - "libstagefright_foundation", - "libnetd_client", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtk_vt_service", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libmtk_vt_service.so", - ], - shared_libs: [ - "libandroid_runtime", - "libbinder", - "libutils", - "libcutils", - "libnativehelper", - "libui", - "libgui", - "libmedia", - "libbase", - "libfmq", - "libbinder_ndk", - "vendor.mediatek.hardware.videotelephony@1.0", - "vendor.mediatek.hardware.videotelephony-V1-ndk", - "libhidlbase", - "libhidltransport", - "libimsma", - "libsource", - "libimsma_rtp", - "libvt_avsync", - "libstagefright_foundation", - "libvcodec_cap", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtk_vt_wrapper", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libmtk_vt_wrapper.so", - ], - shared_libs: [ - "libandroid_runtime", - "libbinder", - "libutils", - "libcutils", - "libnativehelper", - "libfmq", - "libbinder_ndk", - "vendor.mediatek.hardware.videotelephony@1.0", - "vendor.mediatek.hardware.videotelephony-V1-ndk", - "libhidlbase", - "libhidltransport", - "libui", - "libgui", - "libmedia", - "libvcodec_cap", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsignal", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libsignal.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "libstagefright_foundation", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsink-mtk", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libsink-mtk.so", - ], - shared_libs: [ - "libaudioclient_shim", - "libbinder", - "libcutils", - "libgui", - "libmedia", - "libstagefright", - "libstagefright_foundation", - "libui", - "libutils", - "libcomutils", - "libvcodec_cap", - "libvt_avsync", - "liblog", - "libmedia_omx", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsource", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libsource.so", - ], - shared_libs: [ - "libui_shim", - "libbinder", - "libcutils", - "libgui", - "libmedia", - "libstagefright", - "libstagefright_foundation", - "libmedia_omx", - "libui", - "libutils", - "libcamera_client", - "libcomutils", - "libvcodec_cap", - "liblog", - "libsignal", - "libhardware", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libvcodec_cap", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libvcodec_cap.so", - ], - shared_libs: [ - "libui", - "libcutils", - "libutils", - "libbinder", - "libexpat", - "liblog", - "libvcodec_capenc", - "libstagefright_omx_utils", - "libstagefright_foundation", - "libion", - "android.hardware.graphics.bufferqueue@2.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libvcodec_capenc", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libvcodec_capenc.so", - ], - shared_libs: [ - "liblog", - "libion", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "libvt_avsync", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libvt_avsync.so", - ], - shared_libs: [ - "libbinder", - "libutils", - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.videotelephony-V1-ndk", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so", - ], - shared_libs: [ - "libbinder_ndk", - "android.hardware.common-V2-ndk", - "android.hardware.common.fmq-V1-ndk", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.videotelephony@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - android_app_import { name: "JVFactoryTest_O7", owner: "xiaomi", @@ -28925,82 +28425,6 @@ android_app_import { soc_specific: true, } -android_app_import { - name: "ImsService", - owner: "xiaomi", - apk: "proprietary/system_ext/priv-app/ImsService/ImsService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, -} - -dex_import { - name: "mediatek-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-common.jar", - ], -} - -dex_import { - name: "mediatek-framework", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-framework.jar", - ], -} - -dex_import { - name: "mediatek-ims-base", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-ims-base.jar", - ], -} - -dex_import { - name: "mediatek-ims-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-ims-common.jar", - ], -} - -dex_import { - name: "mediatek-ims-extension-plugin", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-ims-extension-plugin.jar", - ], -} - -dex_import { - name: "mediatek-telecom-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telecom-common.jar", - ], -} - -dex_import { - name: "mediatek-telephony-base", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telephony-base.jar", - ], -} - -dex_import { - name: "mediatek-telephony-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telephony-common.jar", - ], -} - prebuilt_etc_xml { name: "android.hardware.neuralnetworks-shim-service-mtk.xml", owner: "xiaomi", @@ -30393,32 +29817,3 @@ cc_prebuilt_binary { prefer: true, soc_specific: true, } - -cc_prebuilt_binary { - name: "vtservice", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/vtservice", - ], - shared_libs: [ - "libbinder", - "libutils", - "libcutils", - "liblog", - "libmtk_vt_service", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} diff --git a/proprietary/system/framework/mediatek-common.jar b/proprietary/system/framework/mediatek-common.jar deleted file mode 100644 index 2ab25d4..0000000 Binary files a/proprietary/system/framework/mediatek-common.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-framework.jar b/proprietary/system/framework/mediatek-framework.jar deleted file mode 100644 index 5848b22..0000000 Binary files a/proprietary/system/framework/mediatek-framework.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-ims-base.jar b/proprietary/system/framework/mediatek-ims-base.jar deleted file mode 100644 index 72b8f66..0000000 Binary files a/proprietary/system/framework/mediatek-ims-base.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-ims-common.jar b/proprietary/system/framework/mediatek-ims-common.jar deleted file mode 100644 index 46df2e6..0000000 Binary files a/proprietary/system/framework/mediatek-ims-common.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-ims-extension-plugin.jar b/proprietary/system/framework/mediatek-ims-extension-plugin.jar deleted file mode 100644 index f8b01cc..0000000 Binary files a/proprietary/system/framework/mediatek-ims-extension-plugin.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-telecom-common.jar b/proprietary/system/framework/mediatek-telecom-common.jar deleted file mode 100644 index 83e8dab..0000000 Binary files a/proprietary/system/framework/mediatek-telecom-common.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-telephony-base.jar b/proprietary/system/framework/mediatek-telephony-base.jar deleted file mode 100644 index 2a9f01d..0000000 Binary files a/proprietary/system/framework/mediatek-telephony-base.jar and /dev/null differ diff --git a/proprietary/system/framework/mediatek-telephony-common.jar b/proprietary/system/framework/mediatek-telephony-common.jar deleted file mode 100644 index a6aa0ac..0000000 Binary files a/proprietary/system/framework/mediatek-telephony-common.jar and /dev/null differ diff --git a/proprietary/system_ext/bin/vtservice b/proprietary/system_ext/bin/vtservice deleted file mode 100755 index 9c4dc36..0000000 Binary files a/proprietary/system_ext/bin/vtservice and /dev/null differ diff --git a/proprietary/system_ext/etc/init/init.vtservice.rc b/proprietary/system_ext/etc/init/init.vtservice.rc deleted file mode 100644 index bc6bb95..0000000 --- a/proprietary/system_ext/etc/init/init.vtservice.rc +++ /dev/null @@ -1,15 +0,0 @@ -# VTService .rc configure - -service vtservice /system_ext/bin/vtservice - class main - user system - group system camera graphics inet net_admin net_raw media sdcard_rw radio sdcard_r media_rw - capabilities NET_ADMIN NET_RAW - ioprio rt 4 - disabled - -on property:persist.vendor.vilte_support=1 - start vtservice - -on property:persist.vendor.viwifi_support=1 - start vtservice \ No newline at end of file diff --git a/proprietary/system_ext/lib64/libcomutils.so b/proprietary/system_ext/lib64/libcomutils.so deleted file mode 100644 index c11a41b..0000000 Binary files a/proprietary/system_ext/lib64/libcomutils.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libimsma.so b/proprietary/system_ext/lib64/libimsma.so deleted file mode 100644 index 4051657..0000000 Binary files a/proprietary/system_ext/lib64/libimsma.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libimsma_adapt.so b/proprietary/system_ext/lib64/libimsma_adapt.so deleted file mode 100644 index c77dc81..0000000 Binary files a/proprietary/system_ext/lib64/libimsma_adapt.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libimsma_rtp.so b/proprietary/system_ext/lib64/libimsma_rtp.so deleted file mode 100644 index ab655de..0000000 Binary files a/proprietary/system_ext/lib64/libimsma_rtp.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libimsma_socketwrapper.so b/proprietary/system_ext/lib64/libimsma_socketwrapper.so deleted file mode 100644 index 3929e7a..0000000 Binary files a/proprietary/system_ext/lib64/libimsma_socketwrapper.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libmtk_vt_service.so b/proprietary/system_ext/lib64/libmtk_vt_service.so deleted file mode 100644 index 1113963..0000000 Binary files a/proprietary/system_ext/lib64/libmtk_vt_service.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libmtk_vt_wrapper.so b/proprietary/system_ext/lib64/libmtk_vt_wrapper.so deleted file mode 100644 index 2da7f65..0000000 Binary files a/proprietary/system_ext/lib64/libmtk_vt_wrapper.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libsignal.so b/proprietary/system_ext/lib64/libsignal.so deleted file mode 100644 index e2e0838..0000000 Binary files a/proprietary/system_ext/lib64/libsignal.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libsink-mtk.so b/proprietary/system_ext/lib64/libsink-mtk.so deleted file mode 100644 index c192e08..0000000 Binary files a/proprietary/system_ext/lib64/libsink-mtk.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libsource.so b/proprietary/system_ext/lib64/libsource.so deleted file mode 100644 index 0dfe604..0000000 Binary files a/proprietary/system_ext/lib64/libsource.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libvcodec_cap.so b/proprietary/system_ext/lib64/libvcodec_cap.so deleted file mode 100644 index 6f471a3..0000000 Binary files a/proprietary/system_ext/lib64/libvcodec_cap.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libvcodec_capenc.so b/proprietary/system_ext/lib64/libvcodec_capenc.so deleted file mode 100644 index 76e2ec3..0000000 Binary files a/proprietary/system_ext/lib64/libvcodec_capenc.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libvt_avsync.so b/proprietary/system_ext/lib64/libvt_avsync.so deleted file mode 100644 index 611a2d6..0000000 Binary files a/proprietary/system_ext/lib64/libvt_avsync.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so b/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so deleted file mode 100644 index 350241d..0000000 Binary files a/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so b/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so deleted file mode 100644 index f985cc2..0000000 Binary files a/proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/priv-app/ImsService/ImsService.apk b/proprietary/system_ext/priv-app/ImsService/ImsService.apk deleted file mode 100644 index c21e0a7..0000000 Binary files a/proprietary/system_ext/priv-app/ImsService/ImsService.apk and /dev/null differ diff --git a/tanzanite-vendor.mk b/tanzanite-vendor.mk index 704b1cf..7c38536 100644 --- a/tanzanite-vendor.mk +++ b/tanzanite-vendor.mk @@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/xiaomi/tanzanite PRODUCT_COPY_FILES += \ - vendor/xiaomi/tanzanite/proprietary/system_ext/etc/init/init.vtservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.vtservice.rc \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/AbnormalDisplayLog_dynamic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/AbnormalDisplayLog_dynamic.xml \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/AudioLog_dynamic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/AudioLog_dynamic.xml \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/MNL_Config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/MNL_Config.xml \ @@ -1681,32 +1680,8 @@ PRODUCT_PACKAGES += \ vendor.mediatek.hardware.videotelephony@1.0_vendor \ vendor.xiaomi.sensor.citsensorservice@1.1 \ vendor.xiaomi.sensor.citsensorservice@2.0 \ - libcomutils \ - libimsma \ - libimsma_adapt \ - libimsma_rtp \ - libimsma_socketwrapper \ - libmtk_vt_service \ - libmtk_vt_wrapper \ - libsignal \ - libsink-mtk \ - libsource \ - libvcodec_cap \ - libvcodec_capenc \ - libvt_avsync \ - vendor.mediatek.hardware.videotelephony-V1-ndk \ - vendor.mediatek.hardware.videotelephony@1.0 \ JVFactoryTest_O7 \ goodix_sz_miui \ - ImsService \ - mediatek-common \ - mediatek-framework \ - mediatek-ims-base \ - mediatek-ims-common \ - mediatek-ims-extension-plugin \ - mediatek-telecom-common \ - mediatek-telephony-base \ - mediatek-telephony-common \ android.hardware.neuralnetworks-shim-service-mtk.xml \ android.hardware.security.keymint-service.mitee.xml \ android.hardware.security.secureclock-service.mitee.xml \ @@ -1760,5 +1735,4 @@ PRODUCT_PACKAGES += \ volte_ua \ wlan_assistant \ wmt_launcher \ - wmt_loader \ - vtservice + wmt_loader