From aabf50b4cf2b36261ab0836bdba16a2fb551d5bb Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Wed, 14 Aug 2019 09:10:00 +0200 Subject: [PATCH] clover: init: remove libinit from device --- BoardConfig.mk | 4 -- device.mk | 4 -- init/Android.mk | 36 ------------- init/init_clover.cpp | 121 ------------------------------------------- 4 files changed, 165 deletions(-) delete mode 100755 init/Android.mk delete mode 100755 init/init_clover.cpp diff --git a/BoardConfig.mk b/BoardConfig.mk index 4f1de45..66e0209 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -39,9 +39,5 @@ DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml # Platform BOARD_VENDOR_PLATFORM := xiaomi-sdm660 -# Vendor init -TARGET_INIT_VENDOR_LIB := libinit_clover -TARGET_RECOVERY_DEVICE_MODULES := libinit_clover - # Vendor Security patch level VENDOR_SECURITY_PATCH := 2018-12-01 diff --git a/device.mk b/device.mk index cc3a7c7..757c8e9 100644 --- a/device.mk +++ b/device.mk @@ -46,10 +46,6 @@ TARGET_SCREEN_WIDTH := 1200 # Device properties $(call inherit-product, $(DEVICE_PATH)/device_prop.mk) -# Init -PRODUCT_PACKAGES += \ - libinit_clover - # Media PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml diff --git a/init/Android.mk b/init/Android.mk deleted file mode 100755 index 16d7939..0000000 --- a/init/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2018 The Xiaomi-SDM660 Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# This file sets variables that control the way modules are built -# thorughout the system. It should not be used to conditionally -# disable makefiles (the proper mechanism to control what gets -# included in a build is to use PRODUCT_PACKAGES in a product -# definition file). -# - -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_clover.cpp -LOCAL_MODULE := libinit_clover - -include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_clover.cpp b/init/init_clover.cpp deleted file mode 100755 index d0869ec..0000000 --- a/init/init_clover.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/* -# -# Copyright (C) 2018 The Xiaomi-SDM660 Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# This file sets variables that control the way modules are built -# thorughout the system. It should not be used to conditionally -# disable makefiles (the proper mechanism to control what gets -# included in a build is to use PRODUCT_PACKAGES in a product -# definition file). -# - */ - -#include -#include -#include - -#include -#include -#include -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include - -#include "property_service.h" -#include "vendor_init.h" - -using android::base::GetProperty; -using android::base::ReadFileToString; -using android::base::Trim; -using android::init::property_set; - -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); -} - -static void init_alarm_boot_properties() -{ - char const *boot_reason_file = "/proc/sys/kernel/boot_reason"; - char const *power_off_alarm_file = "/persist/alarm/powerOffAlarmSet"; - std::string boot_reason; - std::string power_off_alarm; - std::string reboot_reason = GetProperty("ro.boot.alarmboot", ""); - - if (ReadFileToString(boot_reason_file, &boot_reason) - && ReadFileToString(power_off_alarm_file, &power_off_alarm)) { - /* - * Setup ro.alarm_boot value to true when it is RTC triggered boot up - * For existing PMIC chips, the following mapping applies - * for the value of boot_reason: - * - * 0 -> unknown - * 1 -> hard reset - * 2 -> sudden momentary power loss (SMPL) - * 3 -> real time clock (RTC) - * 4 -> DC charger inserted - * 5 -> USB charger inserted - * 6 -> PON1 pin toggled (for secondary PMICs) - * 7 -> CBLPWR_N pin toggled (for external power supply) - * 8 -> KPDPWR_N pin toggled (power key pressed) - */ - if ((Trim(boot_reason) == "3" || reboot_reason == "true") - && Trim(power_off_alarm) == "1") { - property_set("ro.alarm_boot", "true"); - } else { - property_set("ro.alarm_boot", "false"); - } - } -} - -void vendor_load_properties() -{ - std::string platform; - std::string hw_device; - - char const *hw_id_file = "/sys/devices/platform/HardwareInfo/hw_id"; - - platform = GetProperty("ro.board.platform", ""); - if (platform != ANDROID_TARGET) - return; - - ReadFileToString(hw_id_file, &hw_device); - if (hw_device.find("D9P") != std::string::npos) { - property_override("persist.sys.fp.vendor", "fpc"); - property_override("ro.board.variant", "d9p"); - property_override("vendor.display.lcd_density", "265"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "MI PAD 4 PLUS"); - } else { - property_override("persist.sys.fp.vendor", "none"); - property_override("ro.board.variant", "d9"); - property_override("vendor.display.lcd_density", "320"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "MI PAD 4"); - } - - init_alarm_boot_properties(); -}