diff --git a/mido/Android.bp b/mido/Android.bp index 33779d8c..2d5ec04a 100644 --- a/mido/Android.bp +++ b/mido/Android.bp @@ -5,46 +5,6 @@ soong_namespace { } -cc_prebuilt_library_shared { - name: "libsdm-disp-vndapis", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/libsdm-disp-vndapis.so"], - }, - android_arm64: { - srcs: ["proprietary/vendor/lib64/libsdm-disp-vndapis.so"], - }, - }, - compile_multilib: "both", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libthermalclient", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/libthermalclient.so"], - }, - android_arm64: { - srcs: ["proprietary/vendor/lib64/libthermalclient.so"], - }, - }, - compile_multilib: "both", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libts_detected_face_hal", owner: "xiaomi", @@ -79,6 +39,40 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libsdm-disp-vndapis", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/vendor/lib64/libsdm-disp-vndapis.so"], + }, + }, + compile_multilib: "64", + check_elf_files: false, + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libthermalclient", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/vendor/lib64/libthermalclient.so"], + }, + }, + compile_multilib: "64", + check_elf_files: false, + prefer: true, + soc_specific: true, +} + android_app_import { name: "CneApp", owner: "xiaomi", diff --git a/mido/mido-vendor.mk b/mido/mido-vendor.mk index 40bd2280..4bb32ef9 100644 --- a/mido/mido-vendor.mk +++ b/mido/mido-vendor.mk @@ -251,7 +251,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/lib/libOmxVpp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxVpp.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCL.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib/libQSEEComAPI.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib/libVkLayer_q3dtools.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libacdb-fts.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdb-fts.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libacdbloader.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbloader.so \ @@ -701,7 +700,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/lib/libflash_pmic.so:$(TARGET_COPY_OUT_VENDOR)/lib/libflash_pmic.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgpudataproducer.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgsl.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libhdr_tm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhdr_tm.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libidl.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libjpegdhw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libjpegdhw.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libjpegdmahw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libjpegdmahw.so \ @@ -838,7 +836,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfioctl.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperipheral_client.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcci_legacy.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \ @@ -861,17 +858,12 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/lib/libremosaic_daemon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libremosaic_daemon.so \ vendor/xiaomi/mido/proprietary/vendor/lib/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libscalar.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscalar.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdedrm.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-color.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libsdm-diag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-diag.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libsdmextension.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdmextension.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libseemore.so:$(TARGET_COPY_OUT_VENDOR)/lib/libseemore.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libsensor1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor1.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libsensor_reg.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor_reg.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libsensor_thresh.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor_thresh.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libsensor_user_cal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor_user_cal.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libtrueportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtrueportrait.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libubifocus.so:$(TARGET_COPY_OUT_VENDOR)/lib/libubifocus.so \ vendor/xiaomi/mido/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \ @@ -889,10 +881,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/lib/soundfx/libqcbassboost.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcbassboost.so \ vendor/xiaomi/mido/proprietary/vendor/lib/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcreverb.so \ vendor/xiaomi/mido/proprietary/vendor/lib/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcvirt.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.display.color@1.0.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/vendor.display.color@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.display.color@1.1.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/vendor.display.color@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.display.color@1.2.so \ - vendor/xiaomi/mido/proprietary/vendor/lib/vendor.display.postproc@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.display.postproc@1.0.so \ vendor/xiaomi/mido/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \ vendor/xiaomi/mido/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.tui_comm@1.0.so \ vendor/xiaomi/mido/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.dpm.api@1.0.so \ @@ -1174,10 +1162,10 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/mido/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/9_version_update_ecc_table.sql PRODUCT_PACKAGES += \ - libsdm-disp-vndapis \ - libthermalclient \ libts_detected_face_hal \ libts_face_beautify_hal \ + libsdm-disp-vndapis \ + libthermalclient \ CneApp \ IWlanService \ TimeService \ diff --git a/mido/proprietary/vendor/lib/libQSEEComAPI.so b/mido/proprietary/vendor/lib/libQSEEComAPI.so deleted file mode 100644 index 1c2f24a7..00000000 Binary files a/mido/proprietary/vendor/lib/libQSEEComAPI.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libhdr_tm.so b/mido/proprietary/vendor/lib/libhdr_tm.so deleted file mode 100644 index 9e71b0ce..00000000 Binary files a/mido/proprietary/vendor/lib/libhdr_tm.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libperipheral_client.so b/mido/proprietary/vendor/lib/libperipheral_client.so deleted file mode 100644 index 7c088620..00000000 Binary files a/mido/proprietary/vendor/lib/libperipheral_client.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libsdedrm.so b/mido/proprietary/vendor/lib/libsdedrm.so deleted file mode 100644 index b8c83112..00000000 Binary files a/mido/proprietary/vendor/lib/libsdedrm.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libsdm-color.so b/mido/proprietary/vendor/lib/libsdm-color.so deleted file mode 100644 index eeb10425..00000000 Binary files a/mido/proprietary/vendor/lib/libsdm-color.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libsdm-diag.so b/mido/proprietary/vendor/lib/libsdm-diag.so deleted file mode 100644 index 4d901304..00000000 Binary files a/mido/proprietary/vendor/lib/libsdm-diag.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libsdm-disp-vndapis.so b/mido/proprietary/vendor/lib/libsdm-disp-vndapis.so deleted file mode 100644 index 71a6fa89..00000000 Binary files a/mido/proprietary/vendor/lib/libsdm-disp-vndapis.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libsdmextension.so b/mido/proprietary/vendor/lib/libsdmextension.so deleted file mode 100644 index ca9f612f..00000000 Binary files a/mido/proprietary/vendor/lib/libsdmextension.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libthermalclient.so b/mido/proprietary/vendor/lib/libthermalclient.so deleted file mode 100644 index 27aa20fe..00000000 Binary files a/mido/proprietary/vendor/lib/libthermalclient.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/libtinyxml2_1.so b/mido/proprietary/vendor/lib/libtinyxml2_1.so deleted file mode 100644 index e9c8b340..00000000 Binary files a/mido/proprietary/vendor/lib/libtinyxml2_1.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/vendor.display.color@1.0.so b/mido/proprietary/vendor/lib/vendor.display.color@1.0.so deleted file mode 100644 index f117f1fc..00000000 Binary files a/mido/proprietary/vendor/lib/vendor.display.color@1.0.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/vendor.display.color@1.1.so b/mido/proprietary/vendor/lib/vendor.display.color@1.1.so deleted file mode 100644 index 728b1906..00000000 Binary files a/mido/proprietary/vendor/lib/vendor.display.color@1.1.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/vendor.display.color@1.2.so b/mido/proprietary/vendor/lib/vendor.display.color@1.2.so deleted file mode 100644 index b5a18a5a..00000000 Binary files a/mido/proprietary/vendor/lib/vendor.display.color@1.2.so and /dev/null differ diff --git a/mido/proprietary/vendor/lib/vendor.display.postproc@1.0.so b/mido/proprietary/vendor/lib/vendor.display.postproc@1.0.so deleted file mode 100644 index 465eaf4c..00000000 Binary files a/mido/proprietary/vendor/lib/vendor.display.postproc@1.0.so and /dev/null differ