diff --git a/init/init_sdm660.cpp b/init/init_sdm660.cpp index 320daf99..9c261d8a 100644 --- a/init/init_sdm660.cpp +++ b/init/init_sdm660.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2016, The CyanogenMod Project - Copyright (c) 2017, The LineageOS Project + Copyright (c) 2019, The LineageOS Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -42,7 +42,6 @@ #include "vendor_init.h" #include "property_service.h" -#include "init_sdm660.h" using android::base::GetProperty; using android::init::property_set; @@ -55,11 +54,6 @@ char const *heapsize; char const *heapminfree; char const *heapmaxfree; -#ifdef TARGET_HAVE_LIBINIT -__attribute__ ((weak)) -void init_target_properties() {} -#endif - void property_override(char const prop[], char const value[]) { prop_info *pi; @@ -80,10 +74,6 @@ void property_override_dual(char const system_prop[], void vendor_load_properties() { -#ifdef TARGET_HAVE_LIBINIT - init_target_properties(); -#endif - std::string product = GetProperty("ro.product.name", ""); if (product.find("clover") != std::string::npos) { diff --git a/init/init_sdm660.h b/init/init_sdm660.h deleted file mode 100644 index 5d82ddec..00000000 --- a/init/init_sdm660.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_SDM660__H__ -#define __INIT_SDM660__H__ -#ifdef TARGET_HAVE_LIBINIT -void init_target_properties(); -#endif -#endif /* __INIT_WAYNE__H__ */