peregrine: Switch to standalone libinit

* No need to build the msm one

Change-Id: Ifdc43788714fea27a25004ef63497a35d4f6f49c
This commit is contained in:
Michael Bestas 2016-05-10 16:49:31 +02:00 committed by Gerrit Code Review
parent 6f131defc7
commit d3f1fbfb3c
3 changed files with 15 additions and 8 deletions

View File

@ -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

11
init/Android.mk Normal file
View File

@ -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)

View File

@ -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;