From 06c71c33e37e5bbbd65cc443d6ce2e235130f940 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Sun, 8 May 2016 23:44:16 +0300
Subject: [PATCH] osprey: Switch to standalone libinit

* No need to build the msm one

Change-Id: I181e2feccea1aa830010b9b826848d2202e83c43
---
 BoardConfig.mk       |  3 ++-
 init/Android.mk      | 11 +++++++++++
 init/init_osprey.cpp |  8 ++------
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 init/Android.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e09b03a..c3b450b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,7 +24,8 @@ TARGET_OTA_ASSERT_DEVICE := osprey,osprey_umts,osprey_u2,osprey_ud2,osprey_uds,o
 TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
 
 # Init
-TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_osprey.cpp
+TARGET_INIT_VENDOR_LIB := libinit_osprey
+TARGET_RECOVERY_DEVICE_MODULES := libinit_osprey
 
 # Kernel
 TARGET_KERNEL_CONFIG := osprey_defconfig
diff --git a/init/Android.mk b/init/Android.mk
new file mode 100644
index 0000000..764842b
--- /dev/null
+++ b/init/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES := system/core/init
+LOCAL_CPPFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
+LOCAL_SRC_FILES := init_osprey.cpp
+LOCAL_MODULE := libinit_osprey
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_osprey.cpp b/init/init_osprey.cpp
index 7448cf9..c1e7333 100644
--- a/init/init_osprey.cpp
+++ b/init/init_osprey.cpp
@@ -34,7 +34,7 @@
 #include "log.h"
 #include "util.h"
 
-#include "init_msm.h"
+#define ISMATCH(a,b)    (!strncmp(a,b,PROP_VALUE_MAX))
 
 void setMsim()
 {
@@ -43,7 +43,7 @@ void setMsim()
     property_set("ro.telephony.ril.config", "simactivation");
 }
 
-void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *board_type)
+void vendor_load_properties()
 {
     char platform[PROP_VALUE_MAX];
     char radio[PROP_VALUE_MAX];
@@ -53,10 +53,6 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
     char devicename[PROP_VALUE_MAX];
     int rc;
 
-    UNUSED(msm_id);
-    UNUSED(msm_ver);
-    UNUSED(board_type);
-
     rc = property_get("ro.board.platform", platform);
     if (!rc || !ISMATCH(platform, ANDROID_TARGET))
         return;