diff --git a/Android.bp b/Android.bp index 2d4b875..a9288af 100644 --- a/Android.bp +++ b/Android.bp @@ -1,29 +1,211 @@ +// // Automatically generated file. DO NOT MODIFY // -// This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh soong_namespace { - imports: [ - ], + imports: [ + "device/xiaomi/peridot-miuicamera", + ], +} + +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: [ + "libandroid", + "libandroid_runtime", + "libbase", + "libbinder", + "libcamera_client", + "libcamera_metadata", + "libcutils", + "libgui-xiaomi", + "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: [ + "libandroid", + "libbinder", + "libcamera_client", + "libcamera_metadata", + "libcutils", + "libgui-xiaomi", + "liblog", + "libmedia_jni_utils", + "libui", + "libutils", + "libvndksupport", + "libxml2", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, +} + +cc_prebuilt_library_shared { + name: "libgui-xiaomi", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system/lib64/libgui-xiaomi.so", + ], + shared_libs: [ + "libvndksupport", + "libgralloctypes", + "android.hardware.graphics.mapper@4.0", + "android.hardware.graphics.common-V5-ndk", + "android.hardware.graphics.bufferqueue@1.0", + "android.hardware.graphics.bufferqueue@2.0", + "android.hardware.graphics.common@1.1", + "android.hardware.graphics.common@1.2", + "android.hidl.token@1.0-utils", + "libbase", + "libcutils", + "libEGL", + "libhidlbase", + "liblog", + "libnativewindow", + "libsync", + "libui", + "libbinder", + "libGLESv2", + "libutils", + "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", + "libhidltransport", + "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", - apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk", - overrides: [ - "Aperture", - "Camera", - "Camera2", - "CameraGo", - "GoogleCameraGo", - "Snap", - "SnapdragonCamera", - ], - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, + name: "MiuiCamera", + owner: "xiaomi", + apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk", + overrides: [ + "Camera", + "Camera2", + "GoogleCameraGo", + ], + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, } - diff --git a/Android.mk b/Android.mk index eed2c43..362133d 100644 --- a/Android.mk +++ b/Android.mk @@ -1,9 +1,5 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh LOCAL_PATH := $(call my-dir) - -ifeq ($(TARGET_DEVICE),peridot-miuicamera) - -endif diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk index 58af43f..18ed0ae 100644 --- a/BoardConfigVendor.mk +++ b/BoardConfigVendor.mk @@ -1,4 +1,3 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh - diff --git a/peridot-miuicamera-vendor.mk b/peridot-miuicamera-vendor.mk index 73894f2..9871f54 100644 --- a/peridot-miuicamera-vendor.mk +++ b/peridot-miuicamera-vendor.mk @@ -1,16 +1,14 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh PRODUCT_SOONG_NAMESPACES += \ vendor/xiaomi/peridot-miuicamera -PRODUCT_COPY_FILES += \ - vendor/xiaomi/peridot-miuicamera/proprietary/system/lib64/libgui-xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libgui-xiaomi.so \ - vendor/xiaomi/peridot-miuicamera/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_algoup_jni.xiaomi.so \ - vendor/xiaomi/peridot-miuicamera/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_mianode_jni.xiaomi.so \ - vendor/xiaomi/peridot-miuicamera/proprietary/system/lib64/libmicampostproc_client.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmicampostproc_client.so \ - vendor/xiaomi/peridot-miuicamera/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 \ + libgui-xiaomi \ + libmicampostproc_client \ + vendor.xiaomi.hardware.campostproc@1.0_system \ MiuiCamera diff --git a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so index 6f74c8f..fa451b1 100644 Binary files a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so and b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so differ diff --git a/proprietary/system/lib64/libgui-xiaomi.so b/proprietary/system/lib64/libgui-xiaomi.so index 66d5077..e788e5d 100644 Binary files a/proprietary/system/lib64/libgui-xiaomi.so and b/proprietary/system/lib64/libgui-xiaomi.so differ diff --git a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so b/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so index 866a81f..bfb2a55 100644 Binary files a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so and b/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so differ