From c929b55d7a8b9c92d7e174289e894a816b350e49 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Tue, 24 Aug 2021 16:36:40 +0200
Subject: [PATCH] lmi: libinit: Adapt to latest changes

Change-Id: I382e5c98867a6ac56afd890b1701ebc17d3f0192
---
 BoardConfig.mk                                | 4 ++--
 libinit/Android.bp                            | 9 +++++----
 libinit/{init_lmi.cpp => init_xiaomi_lmi.cpp} | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename libinit/{init_lmi.cpp => init_xiaomi_lmi.cpp} (81%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index d89790f..30a462f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,8 +23,8 @@ SOONG_CONFIG_XIAOMI_KONA_FOD_SIZE = 202
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_lmi
-TARGET_RECOVERY_DEVICE_MODULES := libinit_lmi
+TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_lmi
+TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_lmi
 
 # Kernel
 TARGET_KERNEL_CONFIG := vendor/lmi_defconfig
diff --git a/libinit/Android.bp b/libinit/Android.bp
index 586262e..131baf2 100644
--- a/libinit/Android.bp
+++ b/libinit/Android.bp
@@ -5,8 +5,9 @@
 //
 
 cc_library_static {
-    name: "libinit_lmi",
-    defaults: ["//device/xiaomi/sm8250-common:libinit_kona_defaults"],
-    srcs: ["init_lmi.cpp"],
-    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_kona"],
+    name: "init_xiaomi_lmi",
+    srcs: ["init_xiaomi_lmi.cpp"],
+    whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"],
+    include_dirs: ["system/core/init"],
+    recovery_available: true,
 }
diff --git a/libinit/init_lmi.cpp b/libinit/init_xiaomi_lmi.cpp
similarity index 81%
rename from libinit/init_lmi.cpp
rename to libinit/init_xiaomi_lmi.cpp
index 146f185..1ea4a23 100644
--- a/libinit/init_lmi.cpp
+++ b/libinit/init_xiaomi_lmi.cpp
@@ -4,7 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <libinit_kona.h>
+#include <libinit_dalvik_heap.h>
+#include <libinit_variant.h>
+
+#include "vendor_init.h"
 
 static const variant_info_t lmi_info = {
     .hwc_value = "",
@@ -14,7 +17,6 @@ static const variant_info_t lmi_info = {
     .device = "lmi",
     .marketname = "",
     .model = "POCO F2 Pro",
-    .build_description = "lmi-user 11 RKQ1.200826.002 V12.5.2.0.RJKMIXM release-keys",
     .build_fingerprint = "POCO/lmi_global/lmi:11/RKQ1.200826.002/V12.5.2.0.RJKMIXM:user/release-keys",
 
     .nfc = true,
@@ -28,7 +30,6 @@ static const variant_info_t lmipro_info = {
     .device = "lmipro",
     .marketname = "",
     .model = "Redmi K30 Pro Zoom Edition",
-    .build_description = "lmipro-user 11 RKQ1.200826.002 V12.5.2.0.RJKMIXM release-keys",
     .build_fingerprint = "Redmi/lmipro/lmipro:11/RKQ1.200826.002/V12.5.2.0.RJKMIXM:user/release-keys",
 
     .nfc = true,