peridot-miuicamera: Update from OS3.0.6.0.WNPMIXM

Change-Id: I23e1900c84766c96fad9b2f0c40be89d20fd637a

.gitattributes

@@ -0,0 +1 @@
+proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk filter=lfs diff=lfs merge=lfs -text

Android.bp

@@ -1,219 +1,166 @@
+//
 // 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: [
+                "libgui_shim_miuicamera",
+                "libbinder",
+                "libcamera_client",
+                "libcamera_metadata",
+                "libcutils",
+                "libgui",
+                "liblog",
+                "libutils",
+                "libvndksupport",
+                "libandroid",
+                "libandroid_runtime",
+                "libbase",
+                "libmedia_jni_utils",
+                "libnativehelper",
+                "libnativewindow",
+                "libui",
+                "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",
+                "libbinder",
+                "libcamera_client",
+                "libcamera_metadata",
+                "libcutils",
+                "libgui",
+                "liblog",
+                "libutils",
+                "libvndksupport",
+                "libxml2",
+                "libandroid",
+                "libmedia_jni_utils",
+                "libui",
+                "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",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "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",
+    name: "MiuiCamera",
-	owner: "xiaomi",
+    owner: "xiaomi",
-	apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
+    apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
-	overrides: [
+    overrides: [
-		"Aperture",
+        "Aperture",
-		"Camera",
+    ],
-		"Camera2",
+    certificate: "platform",
-		"CameraGo",
+    dex_preopt: {
-		"GoogleCameraGo",
+        enabled: false,
-		"Snap",
+    },
-		"SnapdragonCamera",
+    privileged: true,
-	],
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-}
-
-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,
-	soc_specific: 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,
-	soc_specific: 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: [
-				"libgralloctypes",
-				"android.hardware.graphics.mapper@4.0",
-				"android.hardware.graphics.bufferqueue@1.0",
-				"android.hardware.graphics.bufferqueue@2.0",
-				"android.hardware.graphics.common-V4-ndk",
-				"android.hardware.graphics.common@1.1",
-				"android.hardware.graphics.common@1.2",
-				"android.hidl.token@1.0-utils",
-				"libbase",
-				"libcutils",
-				"libEGL",
-				"libGLESv2",
-				"libhidlbase",
-				"liblog",
-				"libnativewindow",
-				"libsync",
-				"libui",
-				"libutils",
-				"libvndksupport",
-				"libbinder",
-				"libc++",
-				"libc",
-				"libm",
-				"libdl",
-			],
-		},
-	},
-	compile_multilib: "64",
-    check_elf_files: false,
-	prefer: true,
-	soc_specific: 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",
-				"libc++",
-				"libc",
-				"libm",
-				"libdl",
-			],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "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,
-	soc_specific: true,
 }

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

BoardConfigVendor.mk

@@ -1,4 +1,3 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh
-

peridot-miuicamera-vendor.mk

@@ -1,14 +1,13 @@
+#
 # 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_PACKAGES += \
-    MiuiCamera \
     libcamera_algoup_jni.xiaomi \
     libcamera_mianode_jni.xiaomi \
-    libgui-xiaomi \
     libmicampostproc_client \
-    vendor.xiaomi.hardware.campostproc@1.0
+    vendor.xiaomi.hardware.campostproc@1.0 \
+    MiuiCamera

vendorsetup.sh

@@ -1,3 +0,0 @@
-#MiuiCamera.apk
-
-cat vendor/xiaomi/peridot-miuicamera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.part_* > vendor/xiaomi/peridot-miuicamera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk