camera: Fix ELF check failures

Adaptive icon is already present inside apk, just use that one.
Required for themed icon.

Android.bp

@@ -3,6 +3,89 @@
 // This file is generated by vendor/xiaomi/camera/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+	],
+}
+
+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: ["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", "libGLESv2", "libhidlbase", "liblog", "libnativewindow", "libsync", "libui", "libutils", "libvndksupport", "libbinder", "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 {

Android.mk

@@ -3,8 +3,7 @@
 # This file is generated by vendor/xiaomi/camera/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter fuxi,$(TARGET_DEVICE)),)
+ifneq ($(filter fuxi nuwa ishtar vermeer,$(TARGET_DEVICE)),)
 
 CAMERA_LIBRARIES := libcamera_algoup_jni.xiaomi.so libcamera_mianode_jni.xiaomi.so
 

README.md

@@ -4,6 +4,9 @@ Prebuilt MIUI Camera to include in custom ROM builds.
 
 ### Supported devices
 * Xiaomi 13 (fuxi)
+* Xiaomi 13 Pro (nuwa)
+* Xiaomi 13 Ultra (ishtar)
+* Poco F6 Pro / Redmi K70 (vermeer)
 
 ### How to use?
 

camera-vendor.mk

@@ -5,12 +5,11 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/camera
 
-PRODUCT_COPY_FILES += \
-    vendor/xiaomi/camera/proprietary/system/lib64/libgui-xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libgui-xiaomi.so \
-    vendor/xiaomi/camera/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_algoup_jni.xiaomi.so \
-    vendor/xiaomi/camera/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_mianode_jni.xiaomi.so \
-    vendor/xiaomi/camera/proprietary/system/lib64/libmicampostproc_client.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmicampostproc_client.so \
-    vendor/xiaomi/camera/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

configs/properties/system_camera_ishtar.prop

@@ -0,0 +1 @@
+ro.product.mod_device=ishtar_global

configs/properties/system_camera_vermeer.prop

@@ -0,0 +1 @@
+ro.product.mod_device=vermeer_global

extract-files.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -56,20 +55,37 @@ fi
 function blob_fixup() {
     case "${1}" in
         system/lib64/libgui-xiaomi.so)
-            patchelf --set-soname libgui-xiaomi.so "${2}"
+            [ "$2" = "" ] && return 0
+            sed -i "s/android.hardware.graphics.common-V4-ndk.so/android.hardware.graphics.common-V5-ndk.so/" "${2}"
             ;;
         system/lib64/libcamera_algoup_jni.xiaomi.so|system/lib64/libcamera_mianode_jni.xiaomi.so)
+            [ "$2" = "" ] && return 0
             patchelf --replace-needed libgui.so libgui-xiaomi.so "${2}"
             ;;
         system/priv-app/MiuiCamera/MiuiCamera.apk)
+            [ "$2" = "" ] && return 0
             tmp_dir="${EXTRACT_TMP_DIR}/MiuiCamera"
             $APKTOOL d -q "$2" -o "$tmp_dir" -f
+            echo "    - Patching apk..."
+            # Use Google photos instead of MIUI gallery
             grep -rl "com.miui.gallery" "$tmp_dir" | xargs sed -i 's|"com.miui.gallery"|"com.google.android.apps.photos"|g'
+            # Use the correct launcher icon
+            sed -i "s/ic_launcher_camera_cv/ic_launcher_camera/" "$tmp_dir/AndroidManifest.xml"
+            echo "    - Rebuilding apk..."
             $APKTOOL b -q "$tmp_dir" -o "$2"
             rm -rf "$tmp_dir"
             split --bytes=20M -d "$2" "$2".part
             ;;
+       *)
+            return 1
+            ;;
     esac
+
+     return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
 }
 
 # Initialize the helper

miuicamera.mk

@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+CAMERA_PACKAGE_NAME := com.android.camera
+
 # Overlays
 PRODUCT_PACKAGES += \
-    MiuiCameraOverlayIcon \
     MiuiCameraOverlayLeicaed
 
 # Permissions
@@ -19,7 +20,9 @@ PRODUCT_COPY_FILES += \
 TARGET_SYSTEM_PROP += vendor/xiaomi/camera/configs/properties/system.prop
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/camera/configs/properties/system_camera_fuxi.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/build_camera_fuxi.prop \
-    vendor/xiaomi/camera/configs/properties/system_camera_nuwa.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/build_camera_nuwa.prop
+    vendor/xiaomi/camera/configs/properties/system_camera_ishtar.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/build_camera_ishtar.prop \
+    vendor/xiaomi/camera/configs/properties/system_camera_nuwa.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/build_camera_nuwa.prop \
+    vendor/xiaomi/camera/configs/properties/system_camera_vermeer.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/build_camera_vermeer.prop
 
 # Sepolicy
 BOARD_VENDOR_SEPOLICY_DIRS += \

overlays/MiuiCameraOverlayIcon/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2023 Paranoid Android
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "MiuiCameraOverlayIcon",
-    product_specific: true,
-}

overlays/MiuiCameraOverlayIcon/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.camera.overlay.icon">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="800"
-        android:targetPackage="com.android.camera" />
-</manifest>

proprietary-files.txt

@@ -1,7 +1,7 @@
-# Unpinned blobs from fuxi_global-user 13 TKQ1.221114.001 V816.0.1.0.UMCMIXM release-keys
+# Unpinned blobs from vermeer_global-user 13 TKQ1.221114.001 V816.0.2.0.UNKMIXM release-keys
 product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=Aperture,Camera,Camera2,GoogleCameraGo
-system/lib64/libgui.so:system/lib64/libgui-xiaomi.so
+system/lib64/libgui.so:system/lib64/libgui-xiaomi.so;FIX_SONAME
 system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so
 system_ext/lib64/libcamera_mianode_jni.xiaomi.so:system/lib64/libcamera_mianode_jni.xiaomi.so
 system_ext/lib64/libmicampostproc_client.so:system/lib64/libmicampostproc_client.so
-system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
+system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so;MODULE_SUFFIX=_system

sepolicy/vendor/file_contexts

@@ -1,74 +1,2 @@
 # same-process HAL files and their dependencies
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libcalculator_skel\.so                 u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libCalculator_skel\.so                 u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libmialgo_basic_cdsp_skel\.so          u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libmialgo_slow_motion_cdsp_skel\.so    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libQnnHtpV69Skel\.so                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpeDspV65Skel\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpeDspV66Skel\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpeHtpV68Skel\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpeHtpV69Skel\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpeHtpV73Skel\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel\.so    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel\.so    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_dsp_v68_domains_v3_skel\.so    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_htp_v65_skel\.so               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_htp_v66_skel\.so               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libsnpe_htp_v68_skel\.so               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libalAILDC\.so                                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libalCFR\.so                                     u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libalhLDC\.so                                    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_beautyshot\.so                        u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_bodyslim\.so                          u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_distortion_correction\.so             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_dualcam_refocus\.so                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_dualcam_refocus_front\.so             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_dualcam_refocus_image\.so             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_dualcam_refocus_rear_t\.so            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_dualcam_refocus_rear_w\.so            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_high_dynamic_range\.so                u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_high_dynamic_range_v5\.so             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_low_light_hdr\.so                     u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_portrait_lighting\.so                 u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libarcsoft_portrait_lighting_c\.so               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libcalculator\.so                                u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libcalculator_htp\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libc\+\+_shared\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libhta\.so                                       u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libhta_hexagon_runtime_snpe\.so                  u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libhvx_interface\.so                             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmiai_portraitsupernight\.so                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmialgoengine\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmialgo_ai_vision\.so                          u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmialgo_basic\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmialgo_ie_capture\.so                         u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmialgo_utils\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmibokeh_712\.so                               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmiocr\.so                                     u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmiStereoFactoryRemapLib\.so                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libmpbase\.so                                    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libPlatformValidatorShared\.so                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libQnnHtp\.so                                    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libQnnHtpPrepare\.so                             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libQnnHtpV69\.so                                 u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libQnnHtpV69Skel\.so                             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libQnnHtpV69Stub\.so                             u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/librelight_only\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libsdk_sr\.so                                    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSNPE\.so                                      u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeDspV65Stub\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeDspV66Stub\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeGpu\.so                                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeHta\.so                                   u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeHtpPrepare\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeHtpV68Stub\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeHtpV69Stub\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libSnpeHtpV73Stub\.so                            u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libsnpe_config\.so                               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libsnpe_dsp_domains_v2\.so                       u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libsnpe_dsp_domains_v3\.so                       u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libst_sr_models\.so                              u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libxmi_high_dynamic_range\.so                    u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libxmi_slow_motion_mein\.so                      u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/libxml2_vendor\.so                               u:object_r:same_process_hal_file:s0
-/(vendor|odm|odm/overlayfs/nuwa/odm)/lib(64)?/lib_denoiser3\.so                                u:object_r:same_process_hal_file:s0
+/(vendor|odm|odm/mount/camera)/lib/rfsa/adsp/libSnpe.*\.so u:object_r:same_process_hal_file:s0

setup-makefiles.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -25,11 +24,32 @@ if [ ! -f "${HELPER}" ]; then
 fi
 source "${HELPER}"
 
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "system" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        vendor.xiaomi.hardware.campostproc@1.0)
+            echo "$1_system"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
 # Initialize the helper
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true
 
 # Warning headers and guards
-write_headers "fuxi"
+write_headers "fuxi nuwa ishtar vermeer"
 sed -i 's|device/|vendor/|g' "$ANDROIDBP" "$ANDROIDMK" "$BOARDMK" "$PRODUCTMK"
 
 cat << 'EOF' >> "$ANDROIDMK"
@@ -46,7 +66,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(CAMERA_SYMLINKS)
 
 EOF
 
-write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files.txt"
 
 # Finish
 write_footers