From: Jan Altensen Date: Tue, 10 Sep 2019 12:42:07 +0000 (+0200) Subject: j7elte: Convert libinit to Android.bp X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8029384c013ae47ada3871fc374afbf8b31d69d6;p=GitHub%2FLineageOS%2Fandroid_device_samsung_j7elte.git j7elte: Convert libinit to Android.bp * also rename it to avoid collisions while at it Change-Id: Ibdb0ddbd729201e1be9adc5566ca61a900be7aa4 --- diff --git a/BoardConfig.mk b/BoardConfig.mk index 292dc56..674c8ce 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -23,7 +23,7 @@ TARGET_OTA_ASSERT_DEVICE := j7elte BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth # Init -TARGET_INIT_VENDOR_LIB := libinit_sec +TARGET_INIT_VENDOR_LIB := libinit_j7elte # Kernel TARGET_KERNEL_CONFIG := lineageos_j7elte_defconfig diff --git a/init/Android.bp b/init/Android.bp new file mode 100644 index 0000000..31ec75b --- /dev/null +++ b/init/Android.bp @@ -0,0 +1,12 @@ +cc_library_static { + name: "libinit_j7elte", + recovery_available: true, + srcs: [ + "init_j7elte.cpp", + ], + whole_static_libs: ["libbase"], + include_dirs: [ + "system/core/base/include", + "system/core/init", + ], +} \ No newline at end of file diff --git a/init/Android.mk b/init/Android.mk deleted file mode 100644 index ab4cf5d..0000000 --- a/init/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := \ - system/core/base/include \ - system/core/init -LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\" -LOCAL_SRC_FILES := init_sec.cpp -LOCAL_MODULE := libinit_sec -LOCAL_STATIC_LIBRARIES += libbase - -include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_j7elte.cpp b/init/init_j7elte.cpp new file mode 100644 index 0000000..b12a151 --- /dev/null +++ b/init/init_j7elte.cpp @@ -0,0 +1,112 @@ +/* + Copyright (c) 2016, The CyanogenMod Project. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ +#include + +#include +#include +#include +#include + +#include "property_service.h" +#include "vendor_init.h" + +using android::base::GetProperty; +using android::base::ReadFileToString; +using android::base::Trim; + +void property_override(char const prop[], char const value[]) +{ + prop_info *pi; + + pi = (prop_info*) __system_property_find(prop); + if (pi) + __system_property_update(pi, value, strlen(value)); + else + __system_property_add(prop, strlen(prop), value, strlen(value)); +} + +void property_override_dual(char const system_prop[], + char const vendor_prop[], char const value[]) +{ + property_override(system_prop, value); + property_override(vendor_prop, value); +} + +void set_sim_info() +{ + const char *simslot_count_path = "/proc/simslot_count"; + std::string simslot_count; + + if (ReadFileToString(simslot_count_path, &simslot_count)) { + simslot_count = Trim(simslot_count); // strip newline + property_override("ro.multisim.simslotcount", simslot_count.c_str()); + if (simslot_count.compare("2") == 0) { + property_override("rild.libpath2", "/system/lib/libsec-ril-dsds.so"); + property_override("persist.radio.multisim.config", "dsds"); + } + } + else { + LOG(ERROR) << "Could not open '" << simslot_count_path << "'\n"; + } +} + +void vendor_load_properties() +{ + std::string bootloader = GetProperty("ro.bootloader", ""); + std::string device; + + if (bootloader.find("J700F") != std::string::npos) { + /* SM-J700F */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7eltexx/j7elte:6.0.1/MMB29K/J700FXXU4BRL2:user/release-keys"); + property_override("ro.build.description", "j7eltexx-user 6.0.1 MMB29K J700FXXU4BRL2 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700F"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "j7elte"); + } else if (bootloader.find("J700M") != std::string::npos) { + /* SM-J700M */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7elteub/j7elte:6.0.1/MMB29K/J700MUBU2BSA1:user/release-keys"); + property_override("ro.build.description", "j7elteub-user 6.0.1 MMB29K J700MUBU2BSA1 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700M"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "j7elte"); + } else if (bootloader.find("J700H") != std::string::npos) { + /* SM-J700H */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7e3gxx/j7e3g:6.0.1/MMB29K/J700HXXS3BRL1:user/release-keys"); + property_override("ro.build.description", "j7e3gxx-user 6.0.1 MMB29K J700HXXS3BRL1 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700H"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "j7e3g"); + } + + set_sim_info(); + + device = GetProperty("ro.product.device", ""); + LOG(ERROR) << "Found bootloader id '" << bootloader.c_str() << "' setting build properties for '" << device.c_str() << "' device\n"; +} diff --git a/init/init_sec.cpp b/init/init_sec.cpp deleted file mode 100644 index a87faab..0000000 --- a/init/init_sec.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/* - Copyright (c) 2016, The CyanogenMod Project. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include - -#include -#include -#include -#include - -#include "property_service.h" -#include "vendor_init.h" - -using android::base::GetProperty; -using android::base::ReadFileToString; -using android::base::Trim; - -void property_override(char const prop[], char const value[]) -{ - prop_info *pi; - - pi = (prop_info*) __system_property_find(prop); - if (pi) - __system_property_update(pi, value, strlen(value)); - else - __system_property_add(prop, strlen(prop), value, strlen(value)); -} - -void property_override_dual(char const system_prop[], - char const vendor_prop[], char const value[]) -{ - property_override(system_prop, value); - property_override(vendor_prop, value); -} - -void set_sim_info() -{ - const char *simslot_count_path = "/proc/simslot_count"; - std::string simslot_count; - - if (ReadFileToString(simslot_count_path, &simslot_count)) { - simslot_count = Trim(simslot_count); // strip newline - property_override("ro.multisim.simslotcount", simslot_count.c_str()); - if (simslot_count.compare("2") == 0) { - property_override("rild.libpath2", "/system/lib/libsec-ril-dsds.so"); - property_override("persist.radio.multisim.config", "dsds"); - } - } - else { - LOG(ERROR) << "Could not open '" << simslot_count_path << "'\n"; - } -} - -void vendor_load_properties() -{ - std::string platform; - std::string bootloader = GetProperty("ro.bootloader", ""); - std::string device; - - platform = GetProperty("ro.board.platform", ""); - if (platform != ANDROID_TARGET) - return; - - if (bootloader.find("J700F") != std::string::npos) { - /* SM-J700F */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7eltexx/j7elte:6.0.1/MMB29K/J700FXXU4BRL2:user/release-keys"); - property_override("ro.build.description", "j7eltexx-user 6.0.1 MMB29K J700FXXU4BRL2 release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700F"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "j7elte"); - } else if (bootloader.find("J700M") != std::string::npos) { - /* SM-J700M */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7elteub/j7elte:6.0.1/MMB29K/J700MUBU2BSA1:user/release-keys"); - property_override("ro.build.description", "j7elteub-user 6.0.1 MMB29K J700MUBU2BSA1 release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700M"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "j7elte"); - } else if (bootloader.find("J700H") != std::string::npos) { - /* SM-J700H */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/j7e3gxx/j7e3g:6.0.1/MMB29K/J700HXXS3BRL1:user/release-keys"); - property_override("ro.build.description", "j7e3gxx-user 6.0.1 MMB29K J700HXXS3BRL1 release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-J700H"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "j7e3g"); - } - - set_sim_info(); - - device = GetProperty("ro.product.device", ""); - LOG(ERROR) << "Found bootloader id '" << bootloader.c_str() << "' setting build properties for '" << device.c_str() << "' device\n"; -}