diff --git a/Android.bp b/Android.bp index 45bff5e..a03ae3c 100644 --- a/Android.bp +++ b/Android.bp @@ -11,6 +11,46 @@ soong_namespace { ], } +cc_prebuilt_library_shared { + name: "libOpenCL_system", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/system/lib/libOpenCL_system.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libvndksupport", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + android_arm64: { + srcs: [ + "proprietary/system/lib64/libOpenCL_system.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libvndksupport", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + prefer: true, +} + cc_prebuilt_library_shared { name: "libcamera_algoup_jni.xiaomi", owner: "xiaomi", @@ -85,6 +125,54 @@ cc_prebuilt_library_shared { prefer: true, } +cc_prebuilt_library_shared { + name: "libcameraimpl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system/lib64/libcameraimpl.so", + ], + shared_libs: [ + "libmqsas", + "liblog", + "libbase", + "libsensor", + "libutils", + "libcutils", + "libbinder", + "libcamera_metadata", + "libcamera_client", + "libsensorprivacy", + "libfmq", + "libopencl-camera", + "android.hardware.camera.common@1.0", + "android.hardware.camera.device@3.2", + "android.hardware.camera.device@3.3", + "android.hardware.camera.device@3.4", + "android.hardware.camera.device@3.5", + "android.hardware.camera.device@3.6", + "android.hardware.camera.device@3.7", + "android.hardware.camera.device-V1-ndk", + "libpermission", + "audioflinger-aidl-cpp", + "audiopolicy-aidl-cpp", + "audioclient-types-aidl-cpp", + "libaudiofoundation", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, +} + cc_prebuilt_library_shared { name: "libmicampostproc_client", owner: "xiaomi", @@ -159,6 +247,58 @@ cc_prebuilt_library_shared { prefer: true, } +cc_prebuilt_library_shared { + name: "libmqsas", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system/lib64/libmqsas.so", + ], + shared_libs: [ + "liblog", + "libcutils", + "libutils", + "libbinder", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, +} + +cc_prebuilt_library_shared { + name: "libopencl-camera", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system/lib64/libopencl-camera.so", + ], + shared_libs: [ + "libcutils", + "libvndksupport", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, +} + cc_prebuilt_library_shared { name: "vendor.xiaomi.hardware.campostproc@1.0", owner: "xiaomi", @@ -662,47 +802,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libOpenCL_system", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/system_ext/lib/libOpenCL_system.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libvndksupport", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libOpenCL_system.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libvndksupport", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - system_ext_specific: true, -} - android_app_import { name: "MiuiCamera", owner: "xiaomi", diff --git a/README.md b/README.md deleted file mode 100644 index 9f25bce..0000000 --- a/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# proprietary_vendor_xiaomi_camera - -Prebuilt modded MIUI/Leica Camera 5.0 for Poco F3/Redmi K40/Mi 11x (alioth), to include in custom ROM builds. - -### How to use? - -1. Clone this repo to `vendor/xiaomi/camera` -2. Clone https://github.com/PocoF3Releases/device_xiaomi_camera to 'device/xiaomi/camera' -3. Inherit it from `device.mk` in device tree: -``` -# Camera -$(call inherit-product-if-exists, device/xiaomi/camera/miuicamera.mk) -``` - -3. Ensure that you added misys vintf dependencies in your framework_compatibility_matrix.xml: - -``` - - vendor.xiaomi.hardware.misys - 1.0 - 2.0 - 3.0 - 4.0 - - IMiSys - default - - -``` -3.1 Reference - https://github.com/PocoF3Releases/device_xiaomi_sm8250-common/commit/26b57664835c487db278dbda83fe936ceb831c63 diff --git a/camera-vendor.mk b/camera-vendor.mk index cd70128..7236381 100644 --- a/camera-vendor.mk +++ b/camera-vendor.mk @@ -42,10 +42,14 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/camera/proprietary/vendor/etc/init/vendor.xiaomi.hardware.misys@4.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.misys@4.0-service.rc PRODUCT_PACKAGES += \ + libOpenCL_system \ libcamera_algoup_jni.xiaomi \ libcamera_mianode_jni.xiaomi \ + libcameraimpl \ libmicampostproc_client \ libmisys_jni.xiaomi \ + libmqsas \ + libopencl-camera \ vendor.xiaomi.hardware.campostproc@1.0 \ vendor.xiaomi.hardware.misys@1.0_system \ vendor.xiaomi.hardware.misys@2.0_system \ @@ -63,7 +67,6 @@ PRODUCT_PACKAGES += \ vendor.xiaomi.hardware.misys@2.0 \ vendor.xiaomi.hardware.misys@3.0 \ vendor.xiaomi.hardware.misys@4.0 \ - libOpenCL_system \ MiuiCamera \ vendor.xiaomi.hardware.misys-V1.0-java \ vendor.xiaomi.hardware.misys-V2.0-java \ diff --git a/proprietary/system_ext/lib/libOpenCL_system.so b/proprietary/system/lib/libOpenCL_system.so similarity index 100% rename from proprietary/system_ext/lib/libOpenCL_system.so rename to proprietary/system/lib/libOpenCL_system.so diff --git a/proprietary/system_ext/lib64/libOpenCL_system.so b/proprietary/system/lib64/libOpenCL_system.so similarity index 100% rename from proprietary/system_ext/lib64/libOpenCL_system.so rename to proprietary/system/lib64/libOpenCL_system.so diff --git a/proprietary/system/lib64/libcameraimpl.so b/proprietary/system/lib64/libcameraimpl.so new file mode 100644 index 0000000..24bddc5 Binary files /dev/null and b/proprietary/system/lib64/libcameraimpl.so differ diff --git a/proprietary/system/lib64/libmqsas.so b/proprietary/system/lib64/libmqsas.so new file mode 100644 index 0000000..7c35b45 Binary files /dev/null and b/proprietary/system/lib64/libmqsas.so differ diff --git a/proprietary/system/lib64/libopencl-camera.so b/proprietary/system/lib64/libopencl-camera.so new file mode 100644 index 0000000..0b7fb37 Binary files /dev/null and b/proprietary/system/lib64/libopencl-camera.so differ