From fd20bb6c813211e15fda6a5891a45ff94119ad7d Mon Sep 17 00:00:00 2001 From: matteo0026 Date: Sat, 18 Dec 2021 22:33:03 +0100 Subject: [PATCH] matisse-common: fix init for LOS 16 Change-Id: Ieb0c83a86ca45a862b48c0499e8d6e10f62c472b --- BoardConfigCommon.mk | 2 +- init/Android.bp | 27 --------------------------- init/Android.mk | 31 +++++++++++++++++++++++++++++++ init/init_matisse.cpp | 39 +++++++++++++++++++-------------------- 4 files changed, 51 insertions(+), 48 deletions(-) delete mode 100644 init/Android.bp create mode 100644 init/Android.mk diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index bebaa5f..f2812fe 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -55,7 +55,7 @@ TARGET_EXFAT_DRIVER := sdfat DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml # Init -TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_matisse +TARGET_INIT_VENDOR_LIB := libinit_matisse # Kernel BOARD_KERNEL_BASE := 0x00000000 diff --git a/init/Android.bp b/init/Android.bp deleted file mode 100644 index 393b61a..0000000 --- a/init/Android.bp +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 2019 The LineageOS 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. - */ - -cc_library_static { - name: "libinit_matisse", - recovery_available: true, - srcs: ["init_matisse.cpp"], - include_dirs: [ - "device/samsung/msm8226-common/init", - "system/core/base/include", - "system/core/init", - ], - whole_static_libs: ["libinit_helpers_sam8226"] -} diff --git a/init/Android.mk b/init/Android.mk new file mode 100644 index 0000000..ae94df1 --- /dev/null +++ b/init/Android.mk @@ -0,0 +1,31 @@ +# +# Copyright (C) 2020 The LineageOS 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional +LOCAL_C_INCLUDES := \ + device/samsung/msm8226-common/init \ + system/core/base/include \ + system/core/init +LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\" +LOCAL_SRC_FILES := init_matisse.cpp +LOCAL_MODULE := libinit_matisse + +LOCAL_WHOLE_STATIC_LIBRARIES := libinit_helpers_sam8226 + +include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_matisse.cpp b/init/init_matisse.cpp index 3f23f51..0904704 100755 --- a/init/init_matisse.cpp +++ b/init/init_matisse.cpp @@ -40,47 +40,46 @@ using android::init::property_set; void vendor_load_properties() { + std::string platform = GetProperty("ro.board.platform", ""); + if (platform != ANDROID_TARGET) + return; + std::string bootloader = GetProperty("ro.bootloader", ""); if (bootloader.find("T530XX") == 0) { /* matissewifixx */ + property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1:user/release-keys"); property_override("ro.build.description", "matissewifixx-user 5.0.2 LRX22G T530XXS1BRH1 release-keys"); - set_ro_product_prop("device", "matissewifi"); - set_ro_build_prop("fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1:user/release-keys"); - set_ro_product_prop("model", "SM-T530"); - set_ro_product_prop("name", "matissewifi"); + property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T530"); + property_override_dual("ro.product.device", "ro.product.vendor.device", "matissewifi"); wifi_properties("wifi-only", "1"); } else if (bootloader.find("T530NU") == 0) { /* matissewifiue */ + property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matissewifiue/matissewifiue:5.0.2/LRX22G/T530NUUEU1BQC1:user/release-keys"); property_override("ro.build.description", "matissewifiue-user 5.0.2 LRX22G T530NUUEU1BQC1 release-keys"); - set_ro_product_prop("device", "matissewifiue"); - set_ro_build_prop("fingerprint", "samsung/matissewifiue/matissewifiue:5.0.2/LRX22G/T530NUUEU1BQC1:user/release-keys"); - set_ro_product_prop("model", "SM-T530NU"); - set_ro_product_prop("name", "matissewifiue"); + property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T530NU"); + property_override_dual("ro.product.device", "ro.product.vendor.device", "matissewifiue"); wifi_properties("wifi-only", "1"); } else if (bootloader.find("T531XX") == 0) { /* matisse3gxx */ + property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXS1BRH1:user/release-keys"); property_override("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXS1BRH1 release-keys"); - set_ro_product_prop("device", "matisse3g"); - set_ro_build_prop("fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXS1BRH1:user/release-keys"); - set_ro_product_prop("model", "SM-T531"); - set_ro_product_prop("name", "matisse3g"); + property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T531"); + property_override_dual("ro.product.device", "ro.product.vendor.device", "matisse3g"); gsm_properties("3", "0"); } else if (bootloader.find("T532XX") == 0) { /* matisse3gjvxx */ + property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisse3gjv/matisse3g:5.0.2/LRX22G/T532JVS1BQB1:user/release-keys"); property_override("ro.build.description", "matisse3gjv-user 5.0.2 LRX22G T532JVS1BQB1 release-keys"); - set_ro_product_prop("device", "matisse3gjv"); - set_ro_build_prop("fingerprint", "samsung/matisse3gjv/matisse3g:5.0.2/LRX22G/T532JVS1BQB1:user/release-keys"); - set_ro_product_prop("model", "SM-T532"); - set_ro_product_prop("name", "matisse3gjv"); + property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T532"); + property_override_dual("ro.product.device", "ro.product.vendor.device", "matisse3gjv"); gsm_properties("3", "0"); } else if (bootloader.find("T535XX") == 0) { /* matisseltexx */ + property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXS1BRJ2:user/release-keys"); property_override("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXS1BRJ2 release-keys"); - set_ro_product_prop("device", "matisselte"); - set_ro_build_prop("fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXS1BRJ2:user/release-keys"); - set_ro_product_prop("model", "SM-T535"); - set_ro_product_prop("name", "matisselte"); + property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T535"); + property_override_dual("ro.product.device", "ro.product.vendor.device", "matisselte"); gsm_properties("9", "1"); } else { wifi_properties("wifi-only", "1");