diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-05 16:24:32 +0300 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2016-05-09 13:48:55 -0700 |
| commit | 2fa3f3d7842f3e0a2858d7d302d0cd246d18591e (patch) | |
| tree | 940719884e9f94448c21722e51ed1a35bfa78bf4 | |
| parent | 0bf7f27d37a19aeeadecc3338a1bc99faaeabaf8 (diff) | |
Z00L: Switch to standalone libinit
* No need to build the msm one
Change-Id: I181e2feccea1aa830010b9b826848d2202e83c43
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | init/Android.mk | 11 | ||||
| -rw-r--r-- | init/init_Z00L.cpp | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 082a59c..b939f2e 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -31,9 +31,9 @@ TARGET_KERNEL_CONFIG := cyanogenmod_Z00L_defconfig TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop # Vendor Unification Init +TARGET_INIT_VENDOR_LIB := libinit_Z00L +TARGET_RECOVERY_DEVICE_MODULES := libinit_Z00L TARGET_UNIFIED_DEVICE := true -TARGET_INIT_VENDOR_LIB := libinit_msm -TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_Z00L.cpp # inherit from the proprietary version -include vendor/asus/Z00L/BoardConfigVendor.mk diff --git a/init/Android.mk b/init/Android.mk new file mode 100644 index 0000000..472fb0a --- /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_Z00L.cpp +LOCAL_MODULE := libinit_Z00L + +include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_Z00L.cpp b/init/init_Z00L.cpp index 7ee5b2e..228f6c1 100644 --- a/init/init_Z00L.cpp +++ b/init/init_Z00L.cpp @@ -36,9 +36,9 @@ #include "log.h" #include "util.h" -#include "init_msm.h" +#define ISMATCH(a,b) (!strncmp(a,b,PROP_VALUE_MAX)) -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 device[PROP_VALUE_MAX]; @@ -47,10 +47,6 @@ void init_msm_properties(unsigned long msm_id , unsigned long msm_ver, char *boa int rc; FILE *fp; - UNUSED(msm_id); - UNUSED(msm_ver); - UNUSED(board_type); - rc = property_get("ro.board.platform", platform); if (!rc || !ISMATCH(platform, ANDROID_TARGET)) return; |