diff --git a/Android.bp b/Android.bp index 17b5522..3dc8cf0 100644 --- a/Android.bp +++ b/Android.bp @@ -4,9 +4,75 @@ soong_namespace { imports: [ + "device/xiaomi/miuicamera-cupid", ], } +cc_prebuilt_library_shared { + name: "libcamera_algoup_jni.xiaomi", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so"], + shared_libs: ["libgui_shim_miuicamera", "libandroid", "libandroid_runtime", "libbase", "libbinder", "libcamera_client", "libcamera_metadata", "libcutils", "libgui", "liblog", "libmedia_jni_utils", "libnativehelper", "libnativewindow", "libui", "libutils", "libvndksupport", "android.hidl.token@1.0-utils", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, +} + +cc_prebuilt_library_shared { + name: "libcamera_mianode_jni.xiaomi", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so"], + shared_libs: ["libgui_shim_miuicamera", "libandroid", "libbinder", "libcamera_client", "libcamera_metadata", "libcutils", "libgui", "liblog", "libmedia_jni_utils", "libui", "libutils", "libvndksupport", "libxml2", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, +} + +cc_prebuilt_library_shared { + name: "libmicampostproc_client", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system/lib64/libmicampostproc_client.so"], + shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libnativewindow", "libEGL", "libGLESv2", "libfmq", "libgui", "libui", "libcamera_client", "libcamera_metadata", "libmedia_jni_utils", "libnativehelper", "libhidlbase", "vendor.xiaomi.hardware.campostproc@1.0-system", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, +} + +cc_prebuilt_library_shared { + name: "vendor.xiaomi.hardware.campostproc@1.0-system", + stem: "vendor.xiaomi.hardware.campostproc@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so"], + shared_libs: ["android.hardware.camera.common@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, +} + android_app_import { name: "MiuiCamera", owner: "xiaomi", diff --git a/miuicamera-cupid-vendor.mk b/miuicamera-cupid-vendor.mk index 5cd31f0..6e63945 100644 --- a/miuicamera-cupid-vendor.mk +++ b/miuicamera-cupid-vendor.mk @@ -5,11 +5,10 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/xiaomi/miuicamera-cupid -PRODUCT_COPY_FILES += \ - vendor/xiaomi/miuicamera-cupid/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_algoup_jni.xiaomi.so \ - vendor/xiaomi/miuicamera-cupid/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_mianode_jni.xiaomi.so \ - vendor/xiaomi/miuicamera-cupid/proprietary/system/lib64/libmicampostproc_client.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmicampostproc_client.so \ - vendor/xiaomi/miuicamera-cupid/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.xiaomi.hardware.campostproc@1.0.so PRODUCT_PACKAGES += \ + libcamera_algoup_jni.xiaomi \ + libcamera_mianode_jni.xiaomi \ + libmicampostproc_client \ + vendor.xiaomi.hardware.campostproc@1.0-system \ MiuiCamera diff --git a/proprietary/system/lib64/libmicampostproc_client.so b/proprietary/system/lib64/libmicampostproc_client.so index 9841972..48cacbd 100644 Binary files a/proprietary/system/lib64/libmicampostproc_client.so and b/proprietary/system/lib64/libmicampostproc_client.so differ diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk index 0c1398a..7e304db 100644 Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk differ