Skip to content

Commit

Permalink
osprey: Switch to standalone libinit
Browse files Browse the repository at this point in the history
* No need to build the msm one

Change-Id: I181e2feccea1aa830010b9b826848d2202e83c43
  • Loading branch information
mikeNG authored and Alberto97 committed May 10, 2016
1 parent e3e89e0 commit 06c71c3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
3 changes: 2 additions & 1 deletion BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions init/Android.mk
Original file line number Diff line number Diff line change
@@ -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)
8 changes: 2 additions & 6 deletions init/init_osprey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -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];
Expand All @@ -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;
Expand Down

0 comments on commit 06c71c3

Please sign in to comment.