cmi: Welcome Evolution X

Change-Id: I7196dce967c9adbc62bb5156ade749c92c7780a1

device.mk

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# Fingerprint
+TARGET_HAS_UDFPS := true
+
 # Inherit from sm8250-common
 $(call inherit-product, device/xiaomi/sm8250-common/kona.mk)
 
@@ -26,7 +29,7 @@ PRODUCT_COPY_FILES += \
     $(call find-copy-subdir-files,qdcm_calib_data_*.xml,$(LOCAL_PATH)/qdcm/,$(TARGET_COPY_OUT_VENDOR)/etc/)
 
 # Init
-$(call soong_config_set,xiaomi_kona,variant_lib,//$(LOCAL_PATH):libvariant_xiaomi_cmi)
+$(call soong_config_set,libinit,vendor_init_lib,//$(LOCAL_PATH):init_xiaomi_cmi)
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \

evolution.dependencies

@@ -6,17 +6,18 @@
   {
     "repository": "SM8250-Development/vendor_xiaomi_sm8250-common",
     "target_path": "vendor/xiaomi/sm8250-common",
-    "remote": "gitlab"
+    "remote": "gitlab",
+    "branch": "vic"
   },
   {
     "repository": "SM8250-Development/vendor_xiaomi_cmi",
-    "target_path": "vendor/xiaomi/umi",
-    "remote": "gitlab"
+    "target_path": "vendor/xiaomi/cmi",
+    "remote": "gitlab",
+    "branch": "vic"
   },
   {
-    "repository": "SM8250-Development/kernel_xiaomi_sm8250",
-    "target_path": "kernel/xiaomi/sm8250",
-    "remote": "github-non-los"
+    "repository": "kernel_xiaomi_sm8250",
+    "target_path": "kernel/xiaomi/sm8250"
   },
   {
     "repository": "hardware_xiaomi",
@@ -26,12 +27,12 @@
     "repository": "Xiaomi-Development/device_xiaomi_camera",
     "target_path": "device/xiaomi/camera",
     "remote": "github-non-los",
-    "branch": "aosp-16"
+    "branch": "aosp-15"
   },
   { 
     "repository": "xiaomi-development/vendor_xiaomi_camera",
     "target_path": "vendor/xiaomi/camera",
     "remote": "gitlab",
-    "branch": "aosp-16"
+    "branch": "aosp-15"
   }
 ]

extract-files.py

@@ -23,10 +23,7 @@ blob_fixups: blob_fixups_user_type = {
         .binary_regex_replace(
             b'/vendor/lib/liba2dpoffload.so',
             b'liba2dpoffload_cmi.so\x00\x00\x00\x00\x00\x00\x00\x00',
-        )
-        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
-    'vendor/lib/libaudioroute_ext.so': blob_fixup()
-        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
+        ),
     'vendor/lib64/camera/components/com.mi.node.watermark.so': blob_fixup()
         .add_needed('libpiex_shim.so'),
     (

libinit/Android.bp

@@ -1,12 +1,13 @@
 //
-// Copyright (C) 2021-2025 The LineageOS Project
+// Copyright (C) 2021 The LineageOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 
 cc_library_static {
-    name: "libvariant_xiaomi_cmi",
-    srcs: ["libvariant_xiaomi_cmi.cpp"],
-    header_libs: ["//device/xiaomi/sm8250-common:libvariant_headers"],
+    name: "init_xiaomi_cmi",
+    srcs: ["init_xiaomi_cmi.cpp"],
+    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"],
+    include_dirs: ["system/core/init"],
     recovery_available: true,
 }

libinit/init_xiaomi_cmi.cpp

@@ -1,12 +1,15 @@
 /*
- * Copyright (C) 2021-2025 The LineageOS Project
+ * Copyright (C) 2021 The LineageOS Project
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <libvariant.h>
+#include <libinit_dalvik_heap.h>
+#include <libinit_variant.h>
 
-static const variant_info cmi_info = {
+#include "vendor_init.h"
+
+static const variant_info_t cmi_info = {
     .hwc_value = "",
     .sku_value = "",
 
@@ -19,6 +22,7 @@ static const variant_info cmi_info = {
     .nfc = true,
 };
 
-const std::vector<variant_info> variants = {
-    cmi_info,
-};
+void vendor_load_properties() {
+    set_variant_props(cmi_info);
+    set_dalvik_heap();
+}

lineage_cmi.mk

@@ -14,9 +14,6 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 # Inherit from cmi device
 $(call inherit-product, device/xiaomi/cmi/device.mk)
 
-# Camera
-include device/xiaomi/camera/miuicamera.mk
-
 # Build Flags
 TARGET_SCREEN_HEIGHT          := 2340
 TARGET_SCREEN_WIDTH           := 1080
@@ -36,3 +33,7 @@ PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildDesc="cmi-user 13 RKQ1.211001.001 V816.0.2.0.TJAMIXM release-keys" \
+    BuildFingerprint=Xiaomi/cmi_global/cmi:13/RKQ1.211001.001/V816.0.2.0.TJAMIXM:user/release-keys
+
+# Camera
+include device/xiaomi/camera/miuicamera.mk

overlay/frameworks/base/core/res/res/values/config.xml

@@ -448,9 +448,6 @@
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
     <string name="config_dozeUdfpsLongPressSensorType" translatable="false">org.lineageos.sensor.udfps</string>
 
-    <!-- Whether to enable fp unlock when screen turns off on udfps devices -->
-    <bool name="config_screen_off_udfps_enabled">true</bool>
-
     <!-- The bounding path of the cutout region of the main built-in display.
          Must either be empty if there is no cutout region, or a string that is parsable by
          {@link android.util.PathParser}.

proprietary-files.txt

@@ -47,14 +47,12 @@ vendor/lib/rfsa/adsp/misound_res.bin
 
 # Audio
 vendor/lib/hw/audio.primary.kona.so:vendor/lib/hw/audio.primary.cmi.so;FIX_SONAME
-vendor/lib/liba2dpoffload.so:vendor/lib/liba2dpoffload_cmi.so;FIX_SONAME
 vendor/lib/vndk/libxlog.so
+vendor/lib/liba2dpoffload.so:vendor/lib/liba2dpoffload_cmi.so;FIX_SONAME
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudiocloudctrl.so
 vendor/lib/libaudioconfigstore.so
-vendor/lib/libaudioparsers.so
 vendor/lib/libaudioroute_ext.so
-vendor/lib/libhdmipassthru.so
 vendor/lib/libresampler.so
 vendor/lib/vendor.qti.hardware.audiohalext@1.0.so
 
@@ -114,31 +112,22 @@ vendor/lib64/camera/fdconfigpreviewlite.bin
 vendor/lib64/camera/fdconfigvideo.bin
 vendor/lib64/camera/fdconfigvideolite.bin
 vendor/lib64/hw/camera.qcom.so
-vendor/lib64/hw/com.qti.chi.override.so
 vendor/lib64/com.qti.feature2.anchorsync.so
 vendor/lib64/com.qti.feature2.demux.so
 vendor/lib64/com.qti.feature2.frameselect.so
 vendor/lib64/com.qti.feature2.fusion.so
-vendor/lib64/com.qti.feature2.generic.so
-vendor/lib64/com.qti.feature2.gs.so
 vendor/lib64/com.qti.feature2.hdr.so
 vendor/lib64/com.qti.feature2.memcpy.so
-vendor/lib64/com.qti.feature2.mfsr.so
 vendor/lib64/com.qti.feature2.qcfa.so
 vendor/lib64/com.qti.feature2.rawhdr.so
 vendor/lib64/com.qti.feature2.rawsupernight.so
-vendor/lib64/com.qti.feature2.rt.so
 vendor/lib64/com.qti.feature2.serializer.so
 vendor/lib64/com.qti.feature2.softispprocess.so
 vendor/lib64/com.qti.feature2.softispsupernight.so
 vendor/lib64/com.qti.feature2.sr.so
 vendor/lib64/com.qti.feature2.stub.so
 vendor/lib64/com.qti.feature2.swmf.so
-vendor/lib64/libHalSuperSensorServer.so
 vendor/lib64/libMIAIHDRhvx_interface.so
-vendor/lib64/libSNPE.so
-vendor/lib64/libSuperSensor.so
-vendor/lib64/libSuperSensorCPU.so
 vendor/lib64/libalAILDC.so
 vendor/lib64/libalCFR.so
 vendor/lib64/libalLDC.so
@@ -160,13 +149,10 @@ vendor/lib64/libarcsoft_portrait_lighting_c.so
 vendor/lib64/libarcsoft_preview_deflicker.so
 vendor/lib64/libarcsoft_super_night_raw.so
 vendor/lib64/libarcsoft_superportrait.so
-vendor/lib64/libc++_shared.so
 vendor/lib64/libcamera_dirty.so
 vendor/lib64/libcamera_nn_stub.so
 vendor/lib64/libcamera_scene.so
 vendor/lib64/libcamerapostproc.so
-vendor/lib64/libchilog.so
-vendor/lib64/libcom.qti.chinodeutils.so
 vendor/lib64/libcvp2.so
 vendor/lib64/libcvp2_hfi.so
 vendor/lib64/libcvp_common.so
@@ -177,8 +163,10 @@ vendor/lib64/libdualcam_video_optical_zoom.so
 vendor/lib64/libflaw.so
 vendor/lib64/libfocus.so
 vendor/lib64/libft2vendor.so
+vendor/lib64/libHalSuperSensorServer.so
 vendor/lib64/libhta.so
 vendor/lib64/libipebpsstriping.so
+vendor/lib64/libmialgoengine.so
 vendor/lib64/libmialgo_ie_capture.so
 vendor/lib64/libmialgo_ie_preview.so
 vendor/lib64/libmialgo_image_colourkeeping.so
@@ -188,15 +176,12 @@ vendor/lib64/libmialgo_utils.so
 vendor/lib64/libmialgo_video_colourkeeping.so
 vendor/lib64/libmialgo_video_enhance.so
 vendor/lib64/libmialgo_video_seg.so
-vendor/lib64/libmialgoengine.so
 vendor/lib64/libmibokeh_845_video.so
 vendor/lib64/libmibokeh_855.so
-vendor/lib64/libmpbase.so
 vendor/lib64/libmulticam_image_optical_zoom.so
 vendor/lib64/libmulticam_optical_zoom_control.so
 vendor/lib64/libmulticam_video_optical_zoom.so
 vendor/lib64/libnpu.so
-vendor/lib64/libofflinelog.so
 vendor/lib64/libos.so
 vendor/lib64/librelight_only.so
 vendor/lib64/libremosaic_wrapper.so
@@ -210,17 +195,16 @@ vendor/lib64/libsnpe_dsp_domains_v2_system.so
 vendor/lib64/libsns_registry_skel.so
 vendor/lib64/libst_soft_isp_calc_exposure_shared.so
 vendor/lib64/libst_soft_isp_shared.so
-vendor/lib64/libsupermoon.so
+vendor/lib64/libSuperSensor.so
+vendor/lib64/libSuperSensorCPU.so
 vendor/lib64/libsymphony-cpu.so
 vendor/lib64/libsynx.so
 vendor/lib64/libthreadutils.so
 vendor/lib64/libtriplecam_optical_zoom_control.so
-vendor/lib64/libtriplecam_video_optical_zoom.so
 vendor/lib64/libvideoBokeh.so
 vendor/lib64/libvideofilter_only.so
 vendor/lib64/libvidhance.so
 vendor/lib64/libxmi_high_dynamic_range.so
-vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
 
 # Camera (CamX)
 vendor/lib64/libcamxexternalformatutils.so