diff --git a/Android.bp b/Android.bp index a4c684f..1f6e75f 100644 --- a/Android.bp +++ b/Android.bp @@ -399,23 +399,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "lib_sr_models", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/lib_sr_models.so"], - shared_libs: ["libc++_shared", "libm", "libdl", "libc", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libarcsat", owner: "xiaomi", @@ -433,74 +416,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libbeauty_face_interface", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libbeauty_face_interface.so"], - shared_libs: ["liblog", "libm", "libc++_shared", "libdl", "libc", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libflaw", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libflaw.so"], - shared_libs: ["libOpenCL", "libc++_shared", "liblog", "libm", "libz", "libc", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "librelight_only", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/librelight_only.so"], - shared_libs: ["libGLESv3", "libEGL", "liblog", "libc++_shared", "libm", "libdl", "libc", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsdk_sr", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libsdk_sr.so"], - shared_libs: ["liblog", "libm", "libOpenCL", "libdl", "libc++_shared", "libc", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libsupermoon", owner: "xiaomi", diff --git a/camera-vendor.mk b/camera-vendor.mk index dae90d8..707bdbe 100644 --- a/camera-vendor.mk +++ b/camera-vendor.mk @@ -36,7 +36,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/camera/proprietary/vendor/etc/camera/127_Creamy.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/127_Creamy.png \ vendor/xiaomi/camera/proprietary/vendor/etc/camera/128_Sepia.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/128_Sepia.png \ vendor/xiaomi/camera/proprietary/vendor/etc/camera/sceneDetection.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/sceneDetection.xml \ - vendor/xiaomi/camera/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.camera.provider@2.4-service_64.rc \ vendor/xiaomi/camera/proprietary/vendor/etc/init/vendor.xiaomi.hardware.misys@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.misys@1.0-service.rc \ vendor/xiaomi/camera/proprietary/vendor/etc/init/vendor.xiaomi.hardware.misys@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.misys@2.0-service.rc \ vendor/xiaomi/camera/proprietary/vendor/etc/init/vendor.xiaomi.hardware.misys@3.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.misys@3.0-service.rc \ @@ -62,12 +61,7 @@ PRODUCT_PACKAGES += \ vendor.xiaomi.hardware.misys@2.0 \ vendor.xiaomi.hardware.misys@3.0 \ vendor.xiaomi.hardware.misys@4.0 \ - lib_sr_models \ libarcsat \ - libbeauty_face_interface \ - libflaw \ - librelight_only \ - libsdk_sr \ libsupermoon \ libOpenCL_system \ MiuiCamera \ diff --git a/proprietary-files.txt b/proprietary-files.txt index c19247d..e516e56 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -15,12 +15,7 @@ system_ext/lib64/libOpenCL_system.so # Device Camera Deps vendor/bin/f2player -vendor/lib64/lib_sr_models.so vendor/lib64/libarcsat.so -vendor/lib64/libbeauty_face_interface.so -vendor/lib64/libflaw.so -vendor/lib64/librelight_only.so -vendor/lib64/libsdk_sr.so vendor/lib64/libsupermoon.so # MiSys @@ -77,9 +72,6 @@ vendor/lib/liblogwrap_vendor.so vendor/lib64/libcheckpid.so vendor/lib64/liblogwrap_vendor.so -# Camera Overwrite -vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc - # Camera Dependencies vendor/camera/fonts/FZMiaoWuJW.ttf vendor/camera/fonts/MFYueYuan-Regular.ttf diff --git a/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc b/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc deleted file mode 100644 index b5a3363..0000000 --- a/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh -# -#Copyright (c) 2019 Qualcomm Technologies, Inc. -#All Rights Reserved. -#Confidential and Proprietary - Qualcomm Technologies, Inc. -# - -service vendor.camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service_64 - override - interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0 - interface vendor.qti.hardware.camera.postproc@1.0::IPostProcService camerapostprocservice - class hal - user cameraserver - group audio camera input drmrpc oem_2907 - ioprio rt 4 - capabilities SYS_NICE - writepid /dev/cpuset/camera-daemon/tasks /dev/stune/foreground/tasks diff --git a/proprietary/vendor/lib64/lib_sr_models.so b/proprietary/vendor/lib64/lib_sr_models.so deleted file mode 100644 index 417bb6e..0000000 Binary files a/proprietary/vendor/lib64/lib_sr_models.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libbeauty_face_interface.so b/proprietary/vendor/lib64/libbeauty_face_interface.so deleted file mode 100644 index 99595b6..0000000 Binary files a/proprietary/vendor/lib64/libbeauty_face_interface.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libflaw.so b/proprietary/vendor/lib64/libflaw.so deleted file mode 100644 index 2f4f190..0000000 Binary files a/proprietary/vendor/lib64/libflaw.so and /dev/null differ diff --git a/proprietary/vendor/lib64/librelight_only.so b/proprietary/vendor/lib64/librelight_only.so deleted file mode 100644 index 78dbe07..0000000 Binary files a/proprietary/vendor/lib64/librelight_only.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libsdk_sr.so b/proprietary/vendor/lib64/libsdk_sr.so deleted file mode 100644 index d6ce529..0000000 Binary files a/proprietary/vendor/lib64/libsdk_sr.so and /dev/null differ