cmi: Move common files to common tree

Android.bp

@@ -5,6 +5,7 @@
 soong_namespace {
     imports: [
         "hardware/qcom-caf/common/libqti-perfd-client",
+        "hardware/qcom-caf/sm8250",
         "hardware/xiaomi",
         "vendor/qcom/opensource/display",
         "vendor/xiaomi/sm8250-common",
@@ -166,32 +167,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libaudioparsers",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libaudioparsers.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libaudioroute_ext",
     owner: "xiaomi",
@@ -221,38 +196,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libhdmipassthru",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libhdmipassthru.so",
-            ],
-            shared_libs: [
-                "libaudioparsers",
-                "libaudioroute",
-                "libaudioutils",
-                "libcutils",
-                "libexpat",
-                "liblog",
-                "libtinyalsa",
-                "libtinycompress",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libresampler",
     owner: "xiaomi",
@@ -3088,85 +3031,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "com.qti.feature2.generic",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/com.qti.feature2.generic.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "com.qti.chi.override",
-                "com.qti.feature2.gs",
-                "libcamera_metadata",
-                "libchilog",
-                "libhardware",
-                "libhidlbase",
-                "libhidltransport",
-                "libqdMetaData",
-                "libutils",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "libz",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "com.qti.feature2.gs",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/com.qti.feature2.gs.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "com.qti.chi.override",
-                "libcamera_metadata",
-                "libchilog",
-                "libhardware",
-                "libhidlbase",
-                "libhidltransport",
-                "libqdMetaData",
-                "libutils",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "libz",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "com.qti.feature2.hdr",
     owner: "xiaomi",
@@ -3247,46 +3111,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "com.qti.feature2.mfsr",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/com.qti.feature2.mfsr.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "com.qti.chi.override",
-                "com.qti.feature2.gs",
-                "libcamera_metadata",
-                "libchilog",
-                "libhardware",
-                "libhidlbase",
-                "libhidltransport",
-                "libqdMetaData",
-                "libutils",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "libz",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "com.qti.feature2.qcfa",
     owner: "xiaomi",
@@ -3407,46 +3231,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "com.qti.feature2.rt",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/com.qti.feature2.rt.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "com.qti.chi.override",
-                "com.qti.feature2.gs",
-                "libcamera_metadata",
-                "libchilog",
-                "libhardware",
-                "libhidlbase",
-                "libhidltransport",
-                "libqdMetaData",
-                "libutils",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "libz",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "com.qti.feature2.serializer",
     owner: "xiaomi",
@@ -3731,45 +3515,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "com.qti.chi.override",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/com.qti.chi.override.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "libcamera_metadata",
-                "libchilog",
-                "libhardware",
-                "libhidlbase",
-                "libhidltransport",
-                "libqdMetaData",
-                "libutils",
-                "vendor.qti.hardware.camera.postproc@1.0-service-impl",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "fingerprint.goodix_fod.default",
     owner: "xiaomi",
@@ -3837,6 +3582,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libHalSuperSensorServer",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libHalSuperSensorServer.so",
+            ],
+            shared_libs: [
+                "libSuperSensor",
+                "libSuperSensorCPU",
+                "liblog",
+                "libm",
+                "libc++_shared",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libMIAIHDRhvx_interface",
     owner: "xiaomi",
@@ -3862,7 +3634,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libSNPE",
+    name: "libSuperSensor",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -3870,14 +3642,38 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libSNPE.so",
+                "proprietary/vendor/lib64/libSuperSensor.so",
             ],
             shared_libs: [
-                "libdl",
                 "liblog",
-                "libc++_shared",
-                "libc",
                 "libm",
+                "libc",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libSuperSensorCPU",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libSuperSensorCPU.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libm",
+                "libc++_shared",
+                "libdl",
+                "libc",
             ],
         },
     },
@@ -3915,6 +3711,32 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libalCFR",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libalCFR.so",
+            ],
+            shared_libs: [
+                "libOpenCL",
+                "libc++_shared",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libalLDC",
     owner: "xiaomi",
@@ -4031,37 +3853,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libarcsat",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libarcsat.so",
-            ],
-            shared_libs: [
-                "libcamera_metadata",
-                "libcom.qti.chinodeutils",
-                "libtriplecam_video_optical_zoom",
-                "libcutils",
-                "libmpbase",
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libarcsoft_beautyshot",
     owner: "xiaomi",
@@ -4454,28 +4245,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libc++_shared",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libc++_shared.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcamera_dirty",
     owner: "xiaomi",
@@ -4910,60 +4679,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libchilog",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libchilog.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libsync",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libcom.qti.chinodeutils",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcom.qti.chinodeutils.so",
-            ],
-            shared_libs: [
-                "libcamera_metadata",
-                "libchilog",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcvp2",
     owner: "xiaomi",
@@ -5319,6 +5034,38 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmialgo_ie_capture",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmialgo_ie_capture.so",
+            ],
+            shared_libs: [
+                "libmialgo_utils",
+                "libion",
+                "libcdsprpc",
+                "libOpenCL",
+                "libc++_shared",
+                "libm",
+                "liblog",
+                "libz",
+                "libc",
+                "libGLESv3",
+                "libEGL",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libmialgo_ie_preview",
     owner: "xiaomi",
@@ -5557,6 +5304,61 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmialgoengine",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmialgoengine.so",
+            ],
+            shared_libs: [
+                "libxmi_high_dynamic_range",
+                "libMIAIHDRhvx_interface",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libhardware",
+                "libnativewindow",
+                "libEGL",
+                "libion",
+                "libGLESv2",
+                "libgrallocutils",
+                "libmpbase",
+                "libarcsoft_beautyshot",
+                "libarcsoft_portrait_lighting",
+                "libarcsoft_portrait_lighting_c",
+                "libmialgo_ie_capture",
+                "libmialgo_utils",
+                "libflaw",
+                "libalCFR",
+                "librelight_only",
+                "libarcsoft_dualcam_refocus",
+                "libarcsoft_distortion_correction",
+                "libarcsoft_bodyslim",
+                "libarcsoft_superportrait",
+                "libsupermoon",
+                "libalhLDC",
+                "libalAILDC",
+                "libHalSuperSensorServer",
+                "libSuperSensor",
+                "libSuperSensorCPU",
+                "libmibokeh_855",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libmibokeh_845_video",
     owner: "xiaomi",
@@ -5614,27 +5416,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmpbase",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libmpbase.so",
-            ],
-            shared_libs: [
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libmulticam_image_optical_zoom",
     owner: "xiaomi",
@@ -5763,34 +5544,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libofflinelog",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libofflinelog.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libsync",
-                "libz",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libos",
     owner: "xiaomi",
@@ -5815,6 +5568,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "librelight_only",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/librelight_only.so",
+            ],
+            shared_libs: [
+                "libGLESv3",
+                "libEGL",
+                "liblog",
+                "libc++_shared",
+                "libm",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libremosaic_wrapper",
     owner: "xiaomi",
@@ -6451,32 +6231,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libtriplecam_video_optical_zoom",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so",
-            ],
-            shared_libs: [
-                "libmpbase",
-                "libOpenCL",
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libultrasound",
     owner: "xiaomi",
@@ -6737,42 +6491,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.camera.postproc@1.0-service-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libofflinelog",
-                "libsync",
-                "android.hardware.graphics.mapper@2.0",
-                "android.hardware.graphics.mapper@3.0",
-                "libcamera_metadata",
-                "libhidlbase",
-                "libhidltransport",
-                "libutils",
-                "vendor.qti.hardware.camera.postproc@1.0",
-                "libz",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.sensorscalibrate@1.0",
     owner: "xiaomi",

cmi-vendor.mk

@@ -212,9 +212,7 @@ PRODUCT_PACKAGES += \
     libaudio_log_utils \
     libaudiocloudctrl \
     libaudioconfigstore \
-    libaudioparsers \
     libaudioroute_ext \
-    libhdmipassthru \
     libresampler \
     vendor.qti.hardware.audiohalext@1.0 \
     libxlog \
@@ -305,15 +303,11 @@ PRODUCT_PACKAGES += \
     com.qti.feature2.demux \
     com.qti.feature2.frameselect \
     com.qti.feature2.fusion \
-    com.qti.feature2.generic \
-    com.qti.feature2.gs \
     com.qti.feature2.hdr \
     com.qti.feature2.memcpy \
-    com.qti.feature2.mfsr \
     com.qti.feature2.qcfa \
     com.qti.feature2.rawhdr \
     com.qti.feature2.rawsupernight \
-    com.qti.feature2.rt \
     com.qti.feature2.serializer \
     com.qti.feature2.softispprocess \
     com.qti.feature2.softispsupernight \
@@ -321,17 +315,18 @@ PRODUCT_PACKAGES += \
     com.qti.feature2.stub \
     com.qti.feature2.swmf \
     camera.qcom \
-    com.qti.chi.override \
     fingerprint.goodix_fod.default \
     vendor.qti.hardware.sensorscalibrate@1.0-impl \
+    libHalSuperSensorServer \
     libMIAIHDRhvx_interface \
-    libSNPE \
+    libSuperSensor \
+    libSuperSensorCPU \
     libalAILDC \
+    libalCFR \
     libalLDC \
     libalhLDC \
     libarcdualcamsat \
     libarcmulticamsat \
-    libarcsat \
     libarcsoft_beautyshot \
     libarcsoft_bodyslim \
     libarcsoft_distortion_correction \
@@ -347,7 +342,6 @@ PRODUCT_PACKAGES += \
     libarcsoft_preview_deflicker \
     libarcsoft_super_night_raw \
     libarcsoft_superportrait \
-    libc++_shared \
     libcamera_dirty \
     libcamera_nn_stub \
     libcamera_scene \
@@ -362,8 +356,6 @@ PRODUCT_PACKAGES += \
     libcamxstatscore \
     libcamxswprocessalgo \
     libcamxtintlessalgo \
-    libchilog \
-    libcom.qti.chinodeutils \
     libcvp2 \
     libcvp2_hfi \
     libcvp_common \
@@ -377,6 +369,7 @@ PRODUCT_PACKAGES += \
     libgf_hal \
     libhta \
     libipebpsstriping \
+    libmialgo_ie_capture \
     libmialgo_ie_preview \
     libmialgo_image_colourkeeping \
     libmialgo_rfs \
@@ -385,16 +378,16 @@ PRODUCT_PACKAGES += \
     libmialgo_video_colourkeeping \
     libmialgo_video_enhance \
     libmialgo_video_seg \
+    libmialgoengine \
     libmibokeh_845_video \
     libmibokeh_855 \
-    libmpbase \
     libmulticam_image_optical_zoom \
     libmulticam_optical_zoom_control \
     libmulticam_video_optical_zoom \
     libnotifyaudiohal \
     libnpu \
-    libofflinelog \
     libos \
+    librelight_only \
     libremosaic_wrapper \
     libremosaichvx_stub \
     libremosaiclib \
@@ -419,7 +412,6 @@ PRODUCT_PACKAGES += \
     libsynx \
     libthreadutils \
     libtriplecam_optical_zoom_control \
-    libtriplecam_video_optical_zoom \
     libultrasound \
     libvideoBokeh \
     libvideofilter_only \
@@ -429,7 +421,6 @@ PRODUCT_PACKAGES += \
     sensors.mius.proximity \
     sensors.ssc \
     sensors.touch \
-    vendor.qti.hardware.camera.postproc@1.0-service-impl \
     vendor.qti.hardware.sensorscalibrate@1.0 \
     capi_v2_cirrus_sp \
     hrtf5c \