umi: Move to the new libinit implementation

Change-Id: I4207a94ff62f0c515c91e186f0ace348c6db7b1d

BoardConfig.mk

@@ -12,9 +12,6 @@ DEVICE_PATH := device/xiaomi/umi
 # Display
 TARGET_SCREEN_DENSITY := 440
 
-# Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_umi
-
 # Kernel
 TARGET_KERNEL_CONFIG += vendor/xiaomi/umi.config
 

device.mk

@@ -32,6 +32,9 @@ PRODUCT_PACKAGES += \
 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_umi)
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \

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_umi",
-    srcs: ["init_xiaomi_umi.cpp"],
-    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"],
-    include_dirs: ["system/core/init"],
+    name: "libvariant_xiaomi_umi",
+    srcs: ["libvariant_xiaomi_umi.cpp"],
+    header_libs: ["//device/xiaomi/sm8250-common:libvariant_headers"],
     recovery_available: true,
 }

libinit/libvariant_xiaomi_umi.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 umi_info = {
+static const variant_info umi_info = {
     .hwc_value = "",
     .sku_value = "",
 
@@ -22,7 +19,6 @@ static const variant_info_t umi_info = {
     .nfc = true,
 };
 
-void vendor_load_properties() {
-    set_variant_props(umi_info);
-    set_dalvik_heap();
-}
+const std::vector<variant_info> variants = {
+    umi_info,
+};