veux: Include MiuiCamera

veux: hidl: add missing FCM entries
The following HALs in device manifest are not declared in FCM <= level 6: android.hardware.ir.IConsumerIr/default (@1) android.hardware.light.ILights/default (@2) android.hardware.usb.gadget.IUsbGadget/default (@1) vendor.lineage.health.IChargingControl/default (@2) vendor.lineage.health.IFastCharge/default (@2)
2025-09-13 15:51:06 +02:00 · 2025-08-21 23:26:05 +02:00 · 2025-08-21 23:15:58 +02:00 · 2025-08-12 15:04:06 +02:00 · 2025-07-28 16:28:07 +02:00 · 2025-07-28 03:46:23 +02:00
12 changed files with 127 additions and 181 deletions
--- a/configs/vintf/device_framework_matrix.xml
+++ b/configs/vintf/device_framework_matrix.xml
@@ -5,11 +5,20 @@
 <compatibility-matrix version="2.0" type="framework">
    <hal format="aidl" optional="true">
        <name>vendor.lineage.health</name>
+        <version>2</version>
        <interface>
            <name>IChargingControl</name>
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.lineage.health</name>
+        <version>2</version>
+        <interface>
+            <name>IFastCharge</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
        <version>2.0-1</version>
@@ -63,6 +72,14 @@
            <instance>clearkey</instance>
        </interface>
    </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.ir</name>
+        <version>1</version>
+        <interface>
+            <name>IConsumerIr</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="hidl" optional="true">
        <name>android.hardware.biometrics.fingerprint</name>
        <version>2.3</version>
@@ -95,6 +112,14 @@
        <instance>default</instance>
    </interface>
    </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.light</name>
+        <version>2</version>
+        <interface>
+            <name>ILights</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
    <hal format="aidl" optional="true">
    <name>android.hardware.sensors</name>
    <version>2</version>
--- a/device.mk
+++ b/device.mk
@@ -574,6 +574,3 @@ $(call inherit-product, vendor/xiaomi/veux/veux-vendor.mk)
 # Remove unwanted packages
 PRODUCT_PACKAGES += \
    RemovePackagesVeux
-
-# AGC CAMERA
-$(call inherit-product, vendor/xiaomi/AGC-Camera/config.mk)
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -1,4 +1,10 @@
 [
+  {
+    "repository": "Xiaomi-Development/device_xiaomi_camera",
+    "target_path": "device/xiaomi/camera",
+    "remote": "github-non-los",
+    "branch": "aosp-15"
+  },
  {
    "repository": "hardware_xiaomi",
    "target_path": "hardware/xiaomi"
@@ -12,9 +18,9 @@
    "target_path": "vendor/xiaomi/veux"
  },
  {
-    "repository": "takixamru/vendor_xiaomi_agc-camera.git",
-    "target_path": "vendor/xiaomi/AGC-Camera",
+    "repository": "xiaomi-development/vendor_xiaomi_camera",
+    "target_path": "vendor/xiaomi/camera",
    "remote": "gitlab",
-    "branch": "main"
+    "branch": "aosp-15"
  }
 ]
--- a/extract-files.py
+++ b/extract-files.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'device/xiaomi/veux',
+    'hardware/qcom-caf/sm8350',
+    'hardware/qcom-caf/wlan',
+    'hardware/xiaomi',
+    'vendor/qcom/opensource/commonsys/display',
+    'vendor/qcom/opensource/commonsys-intf/display',
+    'vendor/qcom/opensource/dataservices',
+    'vendor/qcom/opensource/display',
+]
+
+
+def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
+    return f'{lib}_{partition}' if partition == 'vendor' else None
+
+blob_fixups: blob_fixups_user_type = {
+    'odm/etc/build_*.prop': blob_fixup()
+        .regex_replace(r'.*marketname.*\n', r'')
+        .regex_replace(r'cert', r'model'),
+    
+    'system_ext/etc/init/wfdservice.rc': blob_fixup()
+        .regex_replace(r'^(?!service)(.*)wfdservice$', r'\g<1>wfdservice64'),
+    
+    'system_ext/lib64/libwfdnative.so': blob_fixup()
+        .remove_needed('android.hidl.base@1.0.so'),
+    
+    'vendor/etc/camera/camxoverridesettings.txt': blob_fixup()
+        .regex_replace(r'0x10080', r'0')
+        .regex_replace(r'0x1F', r'0x0'),
+    
+    'vendor/etc/init/init.batterysecret.rc': blob_fixup()
+        .regex_replace(r'on charger', r'on property:init.svc.vendor.charger=running'),
+    
+    'vendor/etc/libnfc-pn557.conf': blob_fixup()
+        .call(lambda file_path, content: 
+              content if "NXP RF" in content 
+              else content + '\n' + open(f"{SRC}/vendor/libnfc-nxp_RF.conf").read()),
+    
+    'vendor/lib64/android.hardware.secure_element@1.0-impl.so': blob_fixup()
+        .remove_needed('android.hidl.base@1.0.so'),
+    
+    'vendor/lib64/camera/components/com.qti.node.mialgocontrol.so': blob_fixup()
+        .add_needed('libpiex_shim.so'),
+    
+    ('vendor/lib64/libwvhidl.so', 'vendor/lib64/mediadrm/libwvdrmengine.so'): blob_fixup()
+        .add_needed('libcrypto_shim.so'),
+    
+    ('vendor/lib64/libdlbdsservice.so', 
+     'vendor/lib/libstagefright_soft_ac4dec.so', 
+     'vendor/lib/libstagefright_soft_ddpdec.so'): blob_fixup()
+        .replace_needed('libstagefright_foundation.so', 'libstagefright_foundation-v33.so'),
+
+    'vendor/etc/libnfc-sn100.conf': blob_fixup()
+        .regex_replace(r'(DEFAULT_ISODEP_ROUTE.*?)0x01', r'\g<1>0xC0')
+        .regex_replace(r'(DEFAULT_SYS_CODE_ROUTE.*?)0x00', r'\g<1>0xC0')
+        .regex_replace(r'(DEFAULT_OFFHOST_ROUTE.*?)0x01', r'\g<1>0xC0')
+        .regex_replace(r'(OFFHOST_ROUTE_ESE.*?)01', r'\g<1>C0')
+        .regex_replace(r'$', r'\nDEFAULT_NFCF_ROUTE=0xC0'),
+}
+
+
+module = ExtractUtilsModule(
+    'veux',
+    'xiaomi',
+    blob_fixups=blob_fixups,
+    namespace_imports=namespace_imports,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,132 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=veux
-VENDOR=xiaomi
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-export TARGET_ENABLE_CHECKELF=false
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-ONLY_FIRMWARE=
-KANG=
-SECTION=
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        --only-firmware)
-            ONLY_FIRMWARE=true
-            ;;
-        -n | --no-cleanup)
-            CLEAN_VENDOR=false
-            ;;
-        -k | --kang)
-            KANG="--kang"
-            ;;
-        -s | --section)
-            SECTION="${2}"
-            shift
-            CLEAN_VENDOR=false
-            ;;
-        *)
-            SRC="${1}"
-            ;;
-    esac
-    shift
-done
-
-if [ -z "${SRC}" ]; then
-    SRC="adb"
-fi
-
-function blob_fixup() {
-    case "${1}" in
-        odm/etc/build_*.prop)
-            [ "$2" = "" ] && return 0
-            sed -i "/marketname/d" "${2}"
-            sed -i "s/cert/model/" "${2}"
-            ;;
-        system_ext/etc/init/wfdservice.rc)
-            [ "$2" = "" ] && return 0
-            sed -i "/^service/! s/wfdservice$/wfdservice64/g" "${2}"
-            ;;
-        system_ext/lib64/libwfdnative.so)
-            [ "$2" = "" ] && return 0
-            "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}"
-            ;;
-        vendor/etc/camera/camxoverridesettings.txt)
-            [ "$2" = "" ] && return 0
-            sed -i "s/0x10080/0/g" "${2}"
-            sed -i "s/0x1F/0x0/g" "${2}"
-            ;;
-        vendor/etc/init/init.batterysecret.rc)
-            [ "$2" = "" ] && return 0
-            sed -i "s/on charger/on property:init.svc.vendor.charger=running/g" "${2}"
-            ;;
-        vendor/etc/libnfc-pn557.conf)
-            [ "$2" = "" ] && return 0
-            grep -q "NXP RF" "${2}" || cat "${SRC}/vendor/libnfc-nxp_RF.conf" >> "${2}"
-            ;;
-        vendor/lib64/android.hardware.secure_element@1.0-impl.so)
-            [ "$2" = "" ] && return 0
-            "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}"
-            ;;
-        vendor/lib64/camera/components/com.qti.node.mialgocontrol.so)
-            [ "$2" = "" ] && return 0
-            llvm-strip --strip-debug "${2}"
-            grep -q "libpiex_shim.so" "${2}" || "${PATCHELF}" --add-needed "libpiex_shim.so" "${2}"
-            ;;
-        vendor/lib64/libwvhidl.so|vendor/lib64/mediadrm/libwvdrmengine.so)
-            [ "$2" = "" ] && return 0
-            grep -q "libcrypto_shim.so" "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
-            ;;
-        vendor/lib64/libdlbdsservice.so|vendor/lib/libstagefright_soft_ac4dec.so|vendor/lib/libstagefright_soft_ddpdec.so)
-        "${PATCHELF}" --replace-needed "libstagefright_foundation.so" "libstagefright_foundation-v33.so" "${2}"
-        ;;
-        vendor/etc/libnfc-sn100.conf)
-            sed -i "/DEFAULT_ISODEP_ROUTE/ s/0x01/0xC0/g" "${2}"
-            sed -i "/DEFAULT_SYS_CODE_ROUTE/ s/0x00/0xC0/g" "${2}"
-            sed -i "/DEFAULT_OFFHOST_ROUTE/ s/0x01/0xC0/g" "${2}"
-            sed -i "/OFFHOST_ROUTE_ESE/ s/01/C0/g" "${2}"
-            echo "DEFAULT_NFCF_ROUTE=0xC0" >> "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-
-    return 0
-}
-
-function blob_fixup_dry() {
-    blob_fixup "$1" ""
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-if [ -z "${ONLY_FIRMWARE}" ]; then
-    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-"${MY_DIR}/setup-makefiles.sh"
--- a/lineage_veux.mk
+++ b/lineage_veux.mk
@@ -36,3 +36,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
    BuildDesc="veux_global-user 13 TKQ1.221114.001 V816.0.12.0.TKCMIXM release-keys" \
    BuildFingerprint=Redmi/veux_global/veux:13/TKQ1.221114.001/V816.0.12.0.TKCMIXM:user/release-keys \
    DeviceProduct=$(PRODUCT_DEVICE)
+
+# Camera
+include device/xiaomi/camera/miuicamera.mk
--- a/overlay/FrameworkOverlayVEUX/res/values/config.xml
+++ b/overlay/FrameworkOverlayVEUX/res/values/config.xml
@@ -456,8 +456,6 @@
         As of Honeycomb, blurring is not supported anymore. -->
    <bool name="config_sf_slowBlur">false</bool>

-    <!-- Speed up the animations -->
-    <fraction name="def_window_animation_scale">80%</fraction>
-    <fraction name="def_window_transition_scale">80%</fraction>
-      
+    <!-- Whether the new Auto Selection Network UI should be shown -->
+    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
 </resources>
--- a/sepolicy/vendor/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
@@ -1,5 +1,4 @@
 type camera_persist_file, vendor_persist_type, file_type;
-vendor_internal_prop(vendor_camera_sensor_prop)

 set_prop(hal_camera_default, vendor_camera_sensor_prop)
 r_dir_file(hal_camera_default, camera_persist_file)
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -3,7 +3,6 @@ ro.vendor.aware_available           u:object_r:vendor_aware_available_prop:s0

 # Camera
 persist.camera.hdr.checkerdump      u:object_r:vendor_camera_prop:s0
-persist.vendor.low.cutoff           u:object_r:vendor_camera_prop:s0
 vendor.camera.sensor.               u:object_r:vendor_camera_sensor_prop:s0
 vendor.camera.sensor.logsystem      u:object_r:vendor_camera_prop:s0
 vendor.panel.display                u:object_r:vendor_camera_prop:s0
--- a/setup-makefiles.py
+++ b/setup-makefiles.py
@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=veux
-VENDOR=xiaomi
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-export TARGET_ENABLE_CHECKELF=false
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
-
-# Warning headers and guards
-write_headers
-
-write_makefiles "${MY_DIR}/proprietary-files.txt"
-
-# Finish
-write_footers
--- a/update-sha1sums.py
+++ b/update-sha1sums.py
Author	SHA1	Message	Date
TechPanelGM	15e475ab29	veux: Include MiuiCamera	2025-09-13 15:51:06 +02:00
thepriyanshujangid	a83d87ca03	veux: hidl: add missing FCM entries The following HALs in device manifest are not declared in FCM <= level 6: android.hardware.ir.IConsumerIr/default (@1) android.hardware.light.ILights/default (@2) android.hardware.usb.gadget.IUsbGadget/default (@1) vendor.lineage.health.IChargingControl/default (@2) vendor.lineage.health.IFastCharge/default (@2)	2025-08-21 23:26:05 +02:00
¨raystef66¨	448b620182	veux: update FCM on IChargingControl and IFastCharge vendor.lineage.health.IChargingControl/default (@2) vendor.lineage.health.IFastCharge/default (@2)	2025-08-21 23:15:58 +02:00
Cassie	3f9b05e50d	veux: overlay: Use the new auto network selection UI Change-Id: I76698911103601d5f3ad67e1099790af8c2fdc18	2025-08-12 15:04:06 +02:00
kailua	346ab9a6af	veux: update-sha1sums: chmod +x	2025-07-28 16:28:07 +02:00
LuK1337	2977f8037f	veux: Migrate to py extract utils Signed-off-by: Onelots <onelots@onelots.fr> Co-authored-by: LuK1337 <priv.luk@gmail.com> Co-authored-by: Skyblueborb <tomaszborbely0710@gmail.com>	2025-07-28 03:46:23 +02:00
				`@@ -0,0 +1 @@`
				`#!./extract-files.py --regenerate_makefiles`