peridot-miuicamera: Overide Aperture Camera

Signed-off-by: GuidixX <guidixm@gmail.com>

Android.bp

@@ -1,32 +1,13 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/xiaomi/peridot-miuicamera/setup-makefiles.sh
 
 soong_namespace {
     imports: [
+        "device/xiaomi/peridot-miuicamera",
     ],
 }
 
-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,
-}
-
 cc_prebuilt_library_shared {
     name: "libcamera_algoup_jni.xiaomi",
     owner: "xiaomi",
@@ -64,7 +45,6 @@ cc_prebuilt_library_shared {
     },
     compile_multilib: "64",
     prefer: true,
-	soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
@@ -100,7 +80,6 @@ cc_prebuilt_library_shared {
     },
     compile_multilib: "64",
     prefer: true,
-	soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
@@ -115,26 +94,26 @@ cc_prebuilt_library_shared {
                 "proprietary/system/lib64/libgui-xiaomi.so",
             ],
             shared_libs: [
+                "libvndksupport",
                 "libgralloctypes",
                 "android.hardware.graphics.mapper@4.0",
+                "android.hardware.graphics.common-V7-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.hardware.graphics.common-V4-ndk",
                 "android.hidl.token@1.0-utils",
                 "libbase",
                 "libcutils",
                 "libEGL",
-				"libGLESv2",
                 "libhidlbase",
                 "liblog",
                 "libnativewindow",
                 "libsync",
                 "libui",
-				"libutils",
-				"libvndksupport",
                 "libbinder",
+                "libGLESv2",
+                "libutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -144,7 +123,6 @@ cc_prebuilt_library_shared {
     },
     compile_multilib: "64",
     prefer: true,
-	soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
@@ -156,7 +134,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-				"proprietary/system/lib64/libmicampostproc_client.so"
+                "proprietary/system/lib64/libmicampostproc_client.so",
             ],
             shared_libs: [
                 "liblog",
@@ -175,7 +153,7 @@ cc_prebuilt_library_shared {
                 "libnativehelper",
                 "libhidlbase",
                 "libhidltransport",
-				"vendor.xiaomi.hardware.campostproc@1.0",
+                "vendor.xiaomi.hardware.campostproc@1.0_system",
                 "libc++",
                 "libc",
                 "libm",
@@ -185,11 +163,11 @@ cc_prebuilt_library_shared {
     },
     compile_multilib: "64",
     prefer: true,
-	soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.xiaomi.hardware.campostproc@1.0",
+    name: "vendor.xiaomi.hardware.campostproc@1.0_system",
+    stem: "vendor.xiaomi.hardware.campostproc@1.0",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -214,5 +192,21 @@ cc_prebuilt_library_shared {
     },
     compile_multilib: "64",
     prefer: true,
-	soc_specific: true,
+}
+
+android_app_import {
+    name: "MiuiCamera",
+    owner: "xiaomi",
+    apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
+    overrides: [
+        "Aperture",
+        "Camera",
+        "Camera2",
+        "GoogleCameraGo",
+    ],
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: 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,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_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_system \
+    MiuiCamera