From d3f1fbfb3cda0b6ac25bfa1274d6b754060be963 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Tue, 10 May 2016 16:49:31 +0200
Subject: [PATCH] peregrine: Switch to standalone libinit

* No need to build the msm one

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

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4555dcf..cd7eb4f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,9 +19,9 @@
 DEVICE_PATH := device/motorola/peregrine
 
 # Vendor Unification Init
+TARGET_INIT_VENDOR_LIB := libinit_peregrine
+TARGET_RECOVERY_DEVICE_MODULES := libinit_peregrine
 TARGET_UNIFIED_DEVICE := true
-TARGET_INIT_VENDOR_LIB := libinit_msm
-TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_peregrine.cpp
 
 # Board
 TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
diff --git a/init/Android.mk b/init/Android.mk
new file mode 100644
index 0000000..3f3f3e4
--- /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_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
+LOCAL_SRC_FILES := init_peregrine.cpp
+LOCAL_MODULE := libinit_peregrine
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_peregrine.cpp b/init/init_peregrine.cpp
index 03ef735..ba3bb10 100644
--- a/init/init_peregrine.cpp
+++ b/init/init_peregrine.cpp
@@ -35,12 +35,12 @@
 #include "log.h"
 #include "util.h"
 
-#include "init_msm.h"
+#define ISMATCH(a,b)    (!strncmp(a,b,PROP_VALUE_MAX))
 
 void gsm_properties();
 void cdma_properties(const char *cdma_sub);
 
-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];
@@ -48,10 +48,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;