diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-10 16:40:10 +0200 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2016-05-22 00:09:00 +0300 |
| commit | f5b42fdd1a9640f4886379f7e2eda63719ab7c2b (patch) | |
| tree | f68dcd515b4c3f5e8850ee4b29ceddb4c43ee00d | |
| parent | 4d24105d09409e66ee4e760ccca78fcc71acbd94 (diff) | |
thea: Switch to standalone libinit
* No need to build the msm one
Change-Id: I361a21d7efdde7a4e6e38c58d94869b27aa38cd1
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | init/Android.mk | 11 | ||||
| -rw-r--r-- | init/init_thea.cpp | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 7913be3..164b822 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -19,9 +19,9 @@ DEVICE_PATH := device/motorola/thea # Vendor Unification Init +TARGET_INIT_VENDOR_LIB := libinit_thea +TARGET_RECOVERY_DEVICE_MODULES := libinit_thea TARGET_UNIFIED_DEVICE := true -TARGET_INIT_VENDOR_LIB := libinit_msm -TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_thea.cpp # Assert TARGET_OTA_ASSERT_DEVICE := thea,thea_umtsds,thea_ds,XT1072,XT1078,XT1079 diff --git a/init/Android.mk b/init/Android.mk new file mode 100644 index 0000000..e4c6523 --- /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_thea.cpp +LOCAL_MODULE := libinit_thea + +include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_thea.cpp b/init/init_thea.cpp index 5a9b0c2..3bf63ef 100644 --- a/init/init_thea.cpp +++ b/init/init_thea.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(bool msim); void cdma_properties(const char *cdma_sub, const char *network); -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; |