diff --git a/Android.bp b/Android.bp index ca226bb..391a4b4 100644 --- a/Android.bp +++ b/Android.bp @@ -5480,8 +5480,8 @@ cc_prebuilt_library_shared { "libcamxfdengine", "libcamxstatscore", "libsync", - "libfacedet", - "libFaceDetectpp-0.5.2", + "libmegface", + "libMegviiFacepp-0.5.2", "libz", "libdl", "libc", @@ -6323,33 +6323,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libFaceDetectpp-0.5.2", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libFaceDetectpp-0.5.2.so", - ], - shared_libs: [ - "libfacedet", - "libc", - "libm", - "libdl", - "liblog", - "libEGL", - "libGLESv2", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libFaceGrade", owner: "xiaomi", @@ -7850,30 +7823,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libfacedet", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libfacedet.so", - ], - shared_libs: [ - "libm", - "liblog", - "libdl", - "libc", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libflaw", owner: "xiaomi", diff --git a/proprietary/vendor/etc/camera/facedetectpp_0_5_2_model b/proprietary/vendor/etc/camera/facedetectpp_0_5_2_model deleted file mode 100644 index 4509745..0000000 Binary files a/proprietary/vendor/etc/camera/facedetectpp_0_5_2_model and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/camera.qcom.so b/proprietary/vendor/lib64/hw/camera.qcom.so index c921075..3a58ecf 100644 Binary files a/proprietary/vendor/lib64/hw/camera.qcom.so and b/proprietary/vendor/lib64/hw/camera.qcom.so differ diff --git a/proprietary/vendor/lib64/libFaceDetectpp-0.5.2.so b/proprietary/vendor/lib64/libFaceDetectpp-0.5.2.so deleted file mode 100644 index 74f4a4e..0000000 Binary files a/proprietary/vendor/lib64/libFaceDetectpp-0.5.2.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libfacedet.so b/proprietary/vendor/lib64/libfacedet.so deleted file mode 100644 index 5dcca74..0000000 Binary files a/proprietary/vendor/lib64/libfacedet.so and /dev/null differ diff --git a/surya-vendor.mk b/surya-vendor.mk index e0115b9..b37ef06 100644 --- a/surya-vendor.mk +++ b/surya-vendor.mk @@ -54,7 +54,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/camxoverridesettings.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/camxoverridesettings.txt \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/eisoverridesettings.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eisoverridesettings.txt \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/eyelineblush.cng:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eyelineblush.cng \ - vendor/xiaomi/surya/proprietary/vendor/etc/camera/facedetectpp_0_5_2_model:$(TARGET_COPY_OUT_VENDOR)/etc/camera/facedetectpp_0_5_2_model \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/female_bg.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/female_bg.png \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/female_icon.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/female_icon.png \ vendor/xiaomi/surya/proprietary/vendor/etc/camera/golden_rear_dc_cal_wd.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/golden_rear_dc_cal_wd.bin \ @@ -463,7 +462,6 @@ PRODUCT_PACKAGES += \ lib-rtpsl \ lib-siputility \ lib-uceservice \ - libFaceDetectpp-0.5.2 \ libFaceGrade \ libGPreqcancel \ libGPreqcancel_svc \ @@ -519,7 +517,6 @@ PRODUCT_PACKAGES += \ libdrmfs \ libdrmtime \ libdsi_netctrl \ - libfacedet \ libflaw \ libft2vendor \ libgdtap \