From 73bc815d397b47f1d6d0c74f98d4a4b697b19a96 Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sat, 31 Aug 2019 18:52:20 +0200 Subject: sdm660-common: Convert to 660 common tree Change-Id: I903039730f4181f6a326f28e0ea212db68bdabcc --- init/Android.mk | 4 +-- init/init_sdm660.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ init/init_sdm660.h | 36 ++++++++++++++++++++ init/init_wayne.cpp | 95 ---------------------------------------------------- init/init_wayne.h | 36 -------------------- 5 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 init/init_sdm660.cpp create mode 100644 init/init_sdm660.h delete mode 100644 init/init_wayne.cpp delete mode 100644 init/init_wayne.h (limited to 'init') diff --git a/init/Android.mk b/init/Android.mk index fc4a5ba..488bdfc 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -21,9 +21,9 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES := \ system/core/base/include \ system/core/init -LOCAL_MODULE := libinit_wayne +LOCAL_MODULE := libinit_sdm660 LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := init_wayne.cpp +LOCAL_SRC_FILES := init_sdm660.cpp LOCAL_STATIC_LIBRARIES := \ libbase \ libselinux diff --git a/init/init_sdm660.cpp b/init/init_sdm660.cpp new file mode 100644 index 0000000..5b76c75 --- /dev/null +++ b/init/init_sdm660.cpp @@ -0,0 +1,95 @@ +/* + Copyright (c) 2016, The CyanogenMod Project + Copyright (c) 2017, The LineageOS Project + + 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 +#include +#include +#include + +#include +#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ +#include + +#include "vendor_init.h" +#include "property_service.h" +#include "init_sdm660.h" + +using android::base::GetProperty; +using android::init::property_set; + +char const *heapstartsize; +char const *heapgrowthlimit; +char const *heapsize; +char const *heapminfree; +char const *heapmaxfree; + +#ifdef TARGET_HAVE_LIBINIT +__attribute__ ((weak)) +void init_target_properties() {} +#endif + +void check_device() +{ + struct sysinfo sys; + + sysinfo(&sys); + + if (sys.totalram > 3072ull * 1024 * 1024) { + // from - phone-xxhdpi-4096-dalvik-heap.mk + heapstartsize = "16m"; + heapgrowthlimit = "256m"; + heapsize = "512m"; + heapminfree = "4m"; + heapmaxfree = "8m"; + } else if (sys.totalram > 2048ull * 1024 * 1024) { + // from - phone-xxhdpi-3072-dalvik-heap.mk + heapstartsize = "8m"; + heapgrowthlimit = "288m"; + heapsize = "768m"; + heapminfree = "512k"; + heapmaxfree = "8m"; + } +} + +void vendor_load_properties() +{ + check_device(); +#ifdef TARGET_HAVE_LIBINIT + init_target_properties(); +#endif + + property_set("dalvik.vm.heapstartsize", heapstartsize); + property_set("dalvik.vm.heapgrowthlimit", heapgrowthlimit); + property_set("dalvik.vm.heapsize", heapsize); + property_set("dalvik.vm.heaptargetutilization", "0.75"); + property_set("dalvik.vm.heapminfree", heapminfree); + property_set("dalvik.vm.heapmaxfree", heapmaxfree); +} diff --git a/init/init_sdm660.h b/init/init_sdm660.h new file mode 100644 index 0000000..d25d9a2 --- /dev/null +++ b/init/init_sdm660.h @@ -0,0 +1,36 @@ +/* + Copyright (c) 2016, The CyanogenMod Project + Copyright (c) 2017, The LineageOS Project + + 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. + */ + +#ifndef __INIT_SDM660__H__ +#define __INIT_SDM660__H__ +#ifdef TARGET_HAVE_LIBINIT +void init_target_properties(); +#endif +#endif /* __INIT_SDM660__H__ */ diff --git a/init/init_wayne.cpp b/init/init_wayne.cpp deleted file mode 100644 index dc6a4a2..0000000 --- a/init/init_wayne.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/* - Copyright (c) 2016, The CyanogenMod Project - Copyright (c) 2017, The LineageOS Project - - 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 -#include -#include -#include - -#include -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include - -#include "vendor_init.h" -#include "property_service.h" -#include "init_wayne.h" - -using android::base::GetProperty; -using android::init::property_set; - -char const *heapstartsize; -char const *heapgrowthlimit; -char const *heapsize; -char const *heapminfree; -char const *heapmaxfree; - -#ifdef TARGET_HAVE_LIBINIT -__attribute__ ((weak)) -void init_target_properties() {} -#endif - -void check_device() -{ - struct sysinfo sys; - - sysinfo(&sys); - - if (sys.totalram > 3072ull * 1024 * 1024) { - // from - phone-xxhdpi-4096-dalvik-heap.mk - heapstartsize = "16m"; - heapgrowthlimit = "256m"; - heapsize = "512m"; - heapminfree = "4m"; - heapmaxfree = "8m"; - } else if (sys.totalram > 2048ull * 1024 * 1024) { - // from - phone-xxhdpi-3072-dalvik-heap.mk - heapstartsize = "8m"; - heapgrowthlimit = "288m"; - heapsize = "768m"; - heapminfree = "512k"; - heapmaxfree = "8m"; - } -} - -void vendor_load_properties() -{ - check_device(); -#ifdef TARGET_HAVE_LIBINIT - init_target_properties(); -#endif - - property_set("dalvik.vm.heapstartsize", heapstartsize); - property_set("dalvik.vm.heapgrowthlimit", heapgrowthlimit); - property_set("dalvik.vm.heapsize", heapsize); - property_set("dalvik.vm.heaptargetutilization", "0.75"); - property_set("dalvik.vm.heapminfree", heapminfree); - property_set("dalvik.vm.heapmaxfree", heapmaxfree); -} diff --git a/init/init_wayne.h b/init/init_wayne.h deleted file mode 100644 index 9630892..0000000 --- a/init/init_wayne.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (c) 2016, The CyanogenMod Project - Copyright (c) 2017, The LineageOS Project - - 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. - */ - -#ifndef __INIT_WAYNE__H__ -#define __INIT_WAYNE__H__ -#ifdef TARGET_HAVE_LIBINIT -void init_target_properties(); -#endif -#endif /* __INIT_WAYNE__H__ */ -- cgit v1.2.3