From 2e8f89749ef3a8833b79c9a67733e192a903bd9e Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <seba@sebaubuntu.dev>
Date: Tue, 28 Oct 2025 01:04:41 +0100
Subject: [PATCH] raphael: Move to the new libinit implementation

Change-Id: I4207a94ff62f0c515c91e186f0ace348c6db7b1d
---
 BoardConfig.mk                                |  3 ---
 device.mk                                     |  3 +++
 libinit/Android.bp                            |  9 ++++-----
 ...hael.cpp => libvariant_xiaomi_raphael.cpp} | 20 ++++++-------------
 4 files changed, 13 insertions(+), 22 deletions(-)
 rename libinit/{init_xiaomi_raphael.cpp => libvariant_xiaomi_raphael.cpp} (66%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 82e6286..5f09e5b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -15,9 +15,6 @@ TARGET_OTA_ASSERT_DEVICE := raphael,raphaelin
 # Display
 TARGET_SCREEN_DENSITY := 440
 
-# Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_raphael
-
 # Kernel
 TARGET_KERNEL_CONFIG += vendor/xiaomi/raphael.config
 
diff --git a/device.mk b/device.mk
index a49dca1..675da8d 100644
--- a/device.mk
+++ b/device.mk
@@ -35,6 +35,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.motor@1.0.vendor
 
+# Init
+$(call soong_config_set,xiaomi_msmnile,variant_lib,//$(LOCAL_PATH):libvariant_xiaomi_raphael)
+
 # Overlays
 PRODUCT_PACKAGES += \
     ApertureOverlayDevice \
diff --git a/libinit/Android.bp b/libinit/Android.bp
index 0669f4f..b2ae142 100644
--- a/libinit/Android.bp
+++ b/libinit/Android.bp
@@ -1,13 +1,12 @@
 //
-// Copyright (C) 2021-2022 The LineageOS Project
+// Copyright (C) 2021-2025 The LineageOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 
 cc_library_static {
-    name: "init_xiaomi_raphael",
-    srcs: ["init_xiaomi_raphael.cpp"],
-    whole_static_libs: ["//device/xiaomi/sm8150-common:libinit_xiaomi_msmnile"],
-    include_dirs: ["system/core/init"],
+    name: "libvariant_xiaomi_raphael",
+    srcs: ["libvariant_xiaomi_raphael.cpp"],
+    header_libs: ["//device/xiaomi/sm8150-common:libvariant_headers"],
     recovery_available: true,
 }
diff --git a/libinit/init_xiaomi_raphael.cpp b/libinit/libvariant_xiaomi_raphael.cpp
similarity index 66%
rename from libinit/init_xiaomi_raphael.cpp
rename to libinit/libvariant_xiaomi_raphael.cpp
index dedcee5..48c56f2 100644
--- a/libinit/init_xiaomi_raphael.cpp
+++ b/libinit/libvariant_xiaomi_raphael.cpp
@@ -1,17 +1,14 @@
 /*
- * Copyright (C) 2021-2022 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 "vendor_init.h"
+#include <libvariant.h>
 
 #define FINGERPRINT "Xiaomi/raphael/raphael:11/RKQ1.200826.002/V12.5.2.0.RFKMIXM:user/release-keys"
 
-static const variant_info_t raphael_global_info = {
+static const variant_info raphael_global_info = {
     .hwc_value = "GLOBAL",
     .sku_value = "",
 
@@ -24,7 +21,7 @@ static const variant_info_t raphael_global_info = {
     .nfc = true,
 };
 
-static const variant_info_t raphaelin_info = {
+static const variant_info raphaelin_info = {
     .hwc_value = "INDIA",
     .sku_value = "",
 
@@ -37,7 +34,7 @@ static const variant_info_t raphaelin_info = {
     .nfc = false,
 };
 
-static const variant_info_t raphael_info = {
+static const variant_info raphael_info = {
     .hwc_value = "",
     .sku_value = "",
 
@@ -50,13 +47,8 @@ static const variant_info_t raphael_info = {
     .nfc = true,
 };
 
-static const std::vector<variant_info_t> variants = {
+const std::vector<variant_info> variants = {
     raphael_global_info,
     raphaelin_info,
     raphael_info,
 };
-
-void vendor_load_properties() {
-    set_dalvik_heap();
-    search_variant(variants);
-}