diff options
| author | Kevin F. Haggerty <kevin.f.haggerty@gmail.com> | 2016-07-12 09:03:39 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <kevin.f.haggerty@gmail.com> | 2016-07-12 17:39:41 -0600 |
| commit | 9a125be76ed0a9976b8a80113d4e497779588cb2 (patch) | |
| tree | 1785c287ca9d7f7ec2555621bf368b4b823eae88 | |
| parent | 17c1ac2de27c0cbcb5176083a8c8c0d0d975f02a (diff) | |
kltekdi: move to msm8974-common libinit
Change-Id: Ic06b33120dbb48a1979e17c1c31c8592a68f4773
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rwxr-xr-x | init/init_klte.cpp | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 7c1f8f2..17192a2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,8 +21,8 @@ TARGET_OTA_ASSERT_DEVICE := kltekdi,klte TARGET_KERNEL_VARIANT_CONFIG := msm8974pro_sec_klte_kdi_defconfig # Init -TARGET_INIT_VENDOR_LIB := libinit_msm -TARGET_LIBINIT_DEFINES_FILE := device/samsung/kltekdi/init/init_klte.cpp +TARGET_INIT_VENDOR_LIB := libinit_msm8974 +TARGET_LIBINIT_MSM8974_DEFINES_FILE := device/samsung/kltekdi/init/init_klte.cpp TARGET_UNIFIED_DEVICE := true # NFC diff --git a/init/init_klte.cpp b/init/init_klte.cpp index 6494a5b..9839688 100755 --- a/init/init_klte.cpp +++ b/init/init_klte.cpp @@ -28,13 +28,16 @@ */ #include <stdlib.h> +#include <stdio.h> #include "vendor_init.h" #include "property_service.h" #include "log.h" #include "util.h" -#include "init_msm.h" +#include "init_msm8974.h" + +#define ISMATCH(a, b) (!strncmp((a), (b), PROP_VALUE_MAX)) void cdma_properties(char const *default_cdma_sub, char const *operator_numeric, char const *operator_alpha) @@ -48,7 +51,7 @@ void cdma_properties(char const *default_cdma_sub, property_set("telephony.lteOnCdmaDevice", "1"); } -void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *board_type) +void init_target_properties() { char platform[PROP_VALUE_MAX]; char bootloader[PROP_VALUE_MAX]; @@ -56,10 +59,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; |