From f6968694986ee8eb2fda84180c26f496bf8a538b Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <seba@sebaubuntu.dev>
Date: Tue, 28 Oct 2025 01:33:39 +0100
Subject: [PATCH] cmi: Move to the new libinit implementation

Change-Id: I4207a94ff62f0c515c91e186f0ace348c6db7b1d
---
 device.mk                                        |  2 +-
 libinit/Android.bp                               |  9 ++++-----
 ..._xiaomi_cmi.cpp => libvariant_xiaomi_cmi.cpp} | 16 ++++++----------
 3 files changed, 11 insertions(+), 16 deletions(-)
 rename libinit/{init_xiaomi_cmi.cpp => libvariant_xiaomi_cmi.cpp} (54%)

diff --git a/device.mk b/device.mk
index ad0ac8e..3b19a44 100644
--- a/device.mk
+++ b/device.mk
@@ -33,7 +33,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,libinit,vendor_init_lib,//$(LOCAL_PATH):init_xiaomi_cmi)
+$(call soong_config_set,xiaomi_kona,variant_lib,//$(LOCAL_PATH):libvariant_xiaomi_cmi)
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
diff --git a/libinit/Android.bp b/libinit/Android.bp
index 7acce1d..de338bb 100644
--- a/libinit/Android.bp
+++ b/libinit/Android.bp
@@ -1,13 +1,12 @@
 //
-// Copyright (C) 2021 The LineageOS Project
+// Copyright (C) 2021-2025 The LineageOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 
 cc_library_static {
-    name: "init_xiaomi_cmi",
-    srcs: ["init_xiaomi_cmi.cpp"],
-    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"],
-    include_dirs: ["system/core/init"],
+    name: "libvariant_xiaomi_cmi",
+    srcs: ["libvariant_xiaomi_cmi.cpp"],
+    header_libs: ["//device/xiaomi/sm8250-common:libvariant_headers"],
     recovery_available: true,
 }
diff --git a/libinit/init_xiaomi_cmi.cpp b/libinit/libvariant_xiaomi_cmi.cpp
similarity index 54%
rename from libinit/init_xiaomi_cmi.cpp
rename to libinit/libvariant_xiaomi_cmi.cpp
index 53866a0..c3f85d5 100644
--- a/libinit/init_xiaomi_cmi.cpp
+++ b/libinit/libvariant_xiaomi_cmi.cpp
@@ -1,15 +1,12 @@
 /*
- * Copyright (C) 2021 The LineageOS Project
+ * Copyright (C) 2021-2025 The LineageOS Project
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <libinit_dalvik_heap.h>
-#include <libinit_variant.h>
+#include <libvariant.h>
 
-#include "vendor_init.h"
-
-static const variant_info_t cmi_info = {
+static const variant_info cmi_info = {
     .hwc_value = "",
     .sku_value = "",
 
@@ -22,7 +19,6 @@ static const variant_info_t cmi_info = {
     .nfc = true,
 };
 
-void vendor_load_properties() {
-    set_variant_props(cmi_info);
-    set_dalvik_heap();
-}
+const std::vector<variant_info> variants = {
+    cmi_info,
+};