From fb68afc7e0e22cb8efa3d5d40a23934f80c59eb3 Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Tue, 10 Sep 2019 14:42:07 +0200
Subject: [PATCH] s5neolte: convert libinit to Android.bp

 * also rename it to avoid collisions while at it

Change-Id: Ibdb0ddbd729201e1be9adc5566ca61a900be7aa4
---
 BoardConfig.mk                           |  2 +-
 init/Android.bp                          | 12 ++++++++++++
 init/Android.mk                          | 14 --------------
 init/{init_sec.cpp => init_s5neolte.cpp} |  5 -----
 4 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 init/Android.bp
 delete mode 100644 init/Android.mk
 rename init/{init_sec.cpp => init_s5neolte.cpp} (97%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6afa9c0..b71de9d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,7 +36,7 @@ BOARD_PROVIDES_LIBRIL := true
 BOARD_NEEDS_ROAMING_PROTOCOL_FIELD := true
 
 # Init
-TARGET_INIT_VENDOR_LIB := libinit_sec
+TARGET_INIT_VENDOR_LIB := libinit_s5neolte
 
 # Partitions
 TARGET_USERIMAGES_USE_F2FS := true
diff --git a/init/Android.bp b/init/Android.bp
new file mode 100644
index 0000000..60aedba
--- /dev/null
+++ b/init/Android.bp
@@ -0,0 +1,12 @@
+cc_library_static {
+    name: "libinit_s5neolte",
+    recovery_available: true,
+    srcs: [
+        "init_s5neolte.cpp",
+    ],
+    whole_static_libs: ["libbase"],
+    include_dirs: [
+        "system/core/base/include",
+        "system/core/init",
+    ],
+}
\ No newline at end of file
diff --git a/init/Android.mk b/init/Android.mk
deleted file mode 100644
index ab4cf5d..0000000
--- a/init/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := \
-    system/core/base/include \
-    system/core/init
-LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
-LOCAL_SRC_FILES := init_sec.cpp
-LOCAL_MODULE := libinit_sec
-LOCAL_STATIC_LIBRARIES += libbase
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_sec.cpp b/init/init_s5neolte.cpp
similarity index 97%
rename from init/init_sec.cpp
rename to init/init_s5neolte.cpp
index 952b563..cee53f3 100644
--- a/init/init_sec.cpp
+++ b/init/init_s5neolte.cpp
@@ -82,14 +82,9 @@ void set_sim_info()
 
 void vendor_load_properties()
 {
-	std::string platform;
 	std::string bootloader = GetProperty("ro.bootloader", "");
 	std::string device;
 
-	platform = GetProperty("ro.board.platform", "");
-	if (platform != ANDROID_TARGET)
-		return;
-
 	if (bootloader.find("G903F") != std::string::npos) {
 		/* SM-G903F */
 		property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/s5neoltexx/s5neolte:6.0.1/MMB29K/G903FXXU1BQC1:user/release-keys");
-- 
2.20.1