diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-10 16:18:22 +0200 |
|---|---|---|
| committer | desaishivam26 <shivamdesaixda@gmail.com> | 2016-05-21 22:32:06 +0530 |
| commit | ddf17d96403c7ecb975b71c973a118d431b4bdec (patch) | |
| tree | a0ad998b5d64b1af0fc34073f5d25a182a097a8b | |
| parent | ec4627efb1dfb21a1a54333ac01973b879c0dd7e (diff) | |
titan: Switch to standalone libinit
* No need to build the msm one
Change-Id: I471a3ff50d9c38d3f1dddf02472bd0eb2f45cccb
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | init/Android.mk | 11 | ||||
| -rw-r--r-- | init/init_titan.cpp | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 54aaa54..1ffc7bf 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -19,9 +19,9 @@ DEVICE_PATH := device/motorola/titan # Vendor Unification Init +TARGET_INIT_VENDOR_LIB := libinit_titan +TARGET_RECOVERY_DEVICE_MODULES := libinit_titan TARGET_UNIFIED_DEVICE := true -TARGET_INIT_VENDOR_LIB := libinit_msm -TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_titan.cpp # Assert TARGET_OTA_ASSERT_DEVICE := titan,titan_umts,titan_udstv,titan_umtsds,titan_retaildsds,XT1068,XT1064,XT1063,XT1069 diff --git a/init/Android.mk b/init/Android.mk new file mode 100644 index 0000000..787454d --- /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_titan.cpp +LOCAL_MODULE := libinit_titan + +include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_titan.cpp b/init/init_titan.cpp index 6e51451..425b828 100644 --- a/init/init_titan.cpp +++ b/init/init_titan.cpp @@ -35,11 +35,11 @@ #include "log.h" #include "util.h" -#include "init_msm.h" +#define ISMATCH(a,b) (!strncmp(a,b,PROP_VALUE_MAX)) void gsm_properties(); -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]; @@ -47,10 +47,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; |