From 3993cd6c020acaa5c7ec4218a845b2081961eb3f Mon Sep 17 00:00:00 2001 From: SebaUbuntu Date: Thu, 5 Aug 2021 13:43:47 +0200 Subject: [PATCH] monet: Add libinit for variants handling Signed-off-by: xSylla --- BoardConfig.mk | 4 ++++ extract-files.sh | 0 libinit/Android.bp | 12 ++++++++++++ libinit/init_monet.cpp | 28 ++++++++++++++++++++++++++++ lineage_monet.mk | 5 ----- setup-makefiles.sh | 0 6 files changed, 44 insertions(+), 5 deletions(-) mode change 100644 => 100755 extract-files.sh create mode 100644 libinit/Android.bp create mode 100644 libinit/init_monet.cpp mode change 100644 => 100755 setup-makefiles.sh diff --git a/BoardConfig.mk b/BoardConfig.mk index 1d1ded7..68b2ed2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,6 +17,10 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include # Display TARGET_SCREEN_DENSITY := 440 +# Init +TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_monet +TARGET_RECOVERY_DEVICE_MODULES := libinit_monet + # Fingerprint SOONG_CONFIG_XIAOMI_LITO_FOD_POS_X = 445 SOONG_CONFIG_XIAOMI_LITO_FOD_POS_Y = 2025 diff --git a/extract-files.sh b/extract-files.sh old mode 100644 new mode 100755 diff --git a/libinit/Android.bp b/libinit/Android.bp new file mode 100644 index 0000000..39f9ecc --- /dev/null +++ b/libinit/Android.bp @@ -0,0 +1,12 @@ +// +// Copyright (C) 2021 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_static { + name: "libinit_monet", + defaults: ["//device/xiaomi/sm7250-common:libinit_lito_defaults"], + srcs: ["init_monet.cpp"], + whole_static_libs: ["//device/xiaomi/sm7250-common:libinit_lito"], +} diff --git a/libinit/init_monet.cpp b/libinit/init_monet.cpp new file mode 100644 index 0000000..7bc4b29 --- /dev/null +++ b/libinit/init_monet.cpp @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2021 The LineageOS Project + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +static const variant_info_t monet_info = { + .hwc_value = "", + .sku_value = "std", + + .brand = "Xiaomi", + .device = "monet", + .marketname = "Mi 10 Lite 5G", + .model = "M2002J9G", + .build_description = "monet-user 11 RKQ1.200826.002 V12.5.1.0.RJIMIXM release-keys", + .build_fingerprint = "Xiaomi/monet_global/monet:11/RKQ1.200826.002/V12.5.1.0.RJIMIXM:user/release-keys", + .nfc = true, +}; + +static const std::vector variants = { + monet_info, +}; + +void vendor_load_properties() { + search_variant(variants); +} diff --git a/lineage_monet.mk b/lineage_monet.mk index 5bed842..2ed9711 100644 --- a/lineage_monet.mk +++ b/lineage_monet.mk @@ -21,8 +21,3 @@ PRODUCT_BRAND := Xiaomi PRODUCT_MODEL := Mi 10 Lite 5G PRODUCT_GMS_CLIENTID_BASE := android-xiaomi - -PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="monet-user 11 RKQ1.200826.002 V12.5.1.0.RJIMIXM release-keys" - -BUILD_FINGERPRINT := Xiaomi/monet_global/monet:11/RKQ1.200826.002/V12.5.1.0.RJIMIXM:user/release-keys diff --git a/setup-makefiles.sh b/setup-makefiles.sh old mode 100644 new mode 100755