From 9b1db5937cfb7b51c122e1e77ccd5318e9528115 Mon Sep 17 00:00:00 2001 From: me-cafebabe <87921983+me-cafebabe@users.noreply.github.com> Date: Sun, 1 Aug 2021 12:54:27 +0800 Subject: [PATCH] umi: Initial adaptions --- Android.mk | 2 +- AndroidProducts.mk | 8 +- BoardConfig.mk | 12 +- audio/audio_platform_info_intcodec.xml | 90 ++++--- audio/mixer_paths.xml | 38 --- audio/mixer_paths_overlay_dynamic.xml | 31 +-- audio/mixer_paths_overlay_static.xml | 219 +++++++++--------- audio/sound_trigger_mixer_paths.xml | 8 +- device.mk | 4 +- extract-files.sh | 2 +- libinit/Android.bp | 4 +- libinit/init_xiaomi_lmi.cpp | 60 ----- libinit/init_xiaomi_umi.cpp | 28 +++ lineage_lmi.mk => lineage_umi.mk | 16 +- .../lineage/res/res/values/config.xml | 52 ----- setup-makefiles.sh | 2 +- vendor.prop | 9 +- 17 files changed, 219 insertions(+), 366 deletions(-) delete mode 100644 libinit/init_xiaomi_lmi.cpp create mode 100644 libinit/init_xiaomi_umi.cpp rename lineage_lmi.mk => lineage_umi.mk (58%) delete mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml diff --git a/Android.mk b/Android.mk index 55fcfdf..2e3dafd 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),lmi) +ifeq ($(TARGET_DEVICE),umi) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index b8ad8a3..c42d997 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,9 +5,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_lmi.mk + $(LOCAL_DIR)/lineage_umi.mk COMMON_LUNCH_CHOICES := \ - lineage_lmi-user \ - lineage_lmi-userdebug \ - lineage_lmi-eng + lineage_umi-user \ + lineage_umi-userdebug \ + lineage_umi-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 6df2021..8315dec 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -7,7 +7,7 @@ # Inherit from sm8250-common include device/xiaomi/sm8250-common/BoardConfigCommon.mk -DEVICE_PATH := device/xiaomi/lmi +DEVICE_PATH := device/xiaomi/umi BUILD_BROKEN_DUP_RULES := true @@ -15,17 +15,17 @@ BUILD_BROKEN_DUP_RULES := true TARGET_SCREEN_DENSITY := 440 # Init -TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_lmi -TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_lmi +TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_umi +TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_umi # Kernel -TARGET_KERNEL_CONFIG := vendor/lmi_defconfig +TARGET_KERNEL_CONFIG := vendor/umi_defconfig # OTA assert -TARGET_OTA_ASSERT_DEVICE := lmi,lmipro +TARGET_OTA_ASSERT_DEVICE := umi # Properties TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop # Inherit from the proprietary version -include vendor/xiaomi/lmi/BoardConfigVendor.mk +include vendor/xiaomi/umi/BoardConfigVendor.mk diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml index a07b463..dd93ca2 100644 --- a/audio/audio_platform_info_intcodec.xml +++ b/audio/audio_platform_info_intcodec.xml @@ -39,6 +39,7 @@ + @@ -123,7 +124,7 @@ - + @@ -154,30 +155,26 @@ - + - - - - + + - - - - - - + + + + @@ -188,40 +185,40 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - + + @@ -238,6 +235,7 @@ + @@ -268,9 +266,7 @@ - - @@ -294,6 +290,7 @@ + @@ -306,16 +303,15 @@ - - - - - - + + + + + diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml index 76743c1..74a9f2c 100644 --- a/audio/mixer_paths.xml +++ b/audio/mixer_paths.xml @@ -225,9 +225,6 @@ - - - @@ -247,9 +244,6 @@ - - - @@ -2077,10 +2071,6 @@ - - - - @@ -2133,10 +2123,6 @@ - - - - @@ -2194,10 +2180,6 @@ - - - - @@ -2313,11 +2295,6 @@ - - - - - @@ -2465,11 +2442,6 @@ - - - - - @@ -3855,10 +3827,6 @@ - - - - @@ -3986,10 +3954,4 @@ - - - - - - diff --git a/audio/mixer_paths_overlay_dynamic.xml b/audio/mixer_paths_overlay_dynamic.xml index b27e54a..c3810a8 100644 --- a/audio/mixer_paths_overlay_dynamic.xml +++ b/audio/mixer_paths_overlay_dynamic.xml @@ -25,37 +25,26 @@ + + + + + - - - - - - - - - - - - - - - - - - - + + + + - - + diff --git a/audio/mixer_paths_overlay_static.xml b/audio/mixer_paths_overlay_static.xml index c8a868a..0158196 100644 --- a/audio/mixer_paths_overlay_static.xml +++ b/audio/mixer_paths_overlay_static.xml @@ -13,32 +13,41 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + @@ -108,76 +117,72 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + - - + + - - + + - - + + @@ -614,30 +619,48 @@ - - + + + - - - - - - - + + - + + + + + + + + + + + - + + + + + + + - + + + + + + + @@ -654,6 +677,8 @@ + + @@ -673,15 +698,15 @@ - - - + + + - - + + - + @@ -702,40 +727,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -744,13 +742,21 @@ - + - + + + + + + + + + @@ -761,6 +767,8 @@ + + @@ -773,14 +781,6 @@ - - - - - - - - @@ -788,18 +788,11 @@ - - - - - - - - - + + diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index e1924a1..82b51c2 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -261,8 +261,8 @@ - - + + @@ -305,8 +305,8 @@ - - + + diff --git a/device.mk b/device.mk index 942364c..0644f39 100644 --- a/device.mk +++ b/device.mk @@ -20,7 +20,7 @@ PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := xhdpi # Boot animation -TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_HEIGHT := 2340 TARGET_SCREEN_WIDTH := 1080 PRODUCT_SHIPPING_API_LEVEL := 29 @@ -38,4 +38,4 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/xiaomi/lmi/lmi-vendor.mk) +$(call inherit-product, vendor/xiaomi/umi/umi-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 9a90097..3e7659c 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,7 +14,7 @@ fi set -e -export DEVICE=lmi +export DEVICE=umi export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi diff --git a/libinit/Android.bp b/libinit/Android.bp index 131baf2..03f65b5 100644 --- a/libinit/Android.bp +++ b/libinit/Android.bp @@ -5,8 +5,8 @@ // cc_library_static { - name: "init_xiaomi_lmi", - srcs: ["init_xiaomi_lmi.cpp"], + name: "init_xiaomi_umi", + srcs: ["init_xiaomi_umi.cpp"], whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"], include_dirs: ["system/core/init"], recovery_available: true, diff --git a/libinit/init_xiaomi_lmi.cpp b/libinit/init_xiaomi_lmi.cpp deleted file mode 100644 index a45171e..0000000 --- a/libinit/init_xiaomi_lmi.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -#include "vendor_init.h" - -static const variant_info_t lmi_global_info = { - .hwc_value = "", - .sku_value = "std", - - .brand = "POCO", - .device = "lmi", - .marketname = "", - .model = "POCO F2 Pro", - .build_fingerprint = "POCO/lmi_global/lmi:11/RKQ1.200826.002/V12.5.3.0.RJKMIXM:user/release-keys", - - .nfc = true, -}; - -static const variant_info_t lmipro_info = { - .hwc_value = "", - .sku_value = "pro", - - .brand = "Redmi", - .device = "lmipro", - .marketname = "", - .model = "Redmi K30 Pro Zoom Edition", - .build_fingerprint = "Redmi/lmipro/lmipro:11/RKQ1.200826.002/V12.5.3.0.RJKMIXM:user/release-keys", - - .nfc = true, -}; - -static const variant_info_t lmi_info = { - .hwc_value = "", - .sku_value = "", - - .brand = "Redmi", - .device = "lmi", - .marketname = "", - .model = "Redmi K30 Pro", - .build_fingerprint = "Redmi/lmi/lmi:11/RKQ1.200826.002/V12.5.3.0.RJKMIXM:user/release-keys", - - .nfc = true, -}; - -static const std::vector variants = { - lmi_global_info, - lmipro_info, - lmi_info, -}; - -void vendor_load_properties() { - search_variant(variants); - set_dalvik_heap(); -} diff --git a/libinit/init_xiaomi_umi.cpp b/libinit/init_xiaomi_umi.cpp new file mode 100644 index 0000000..f4053fe --- /dev/null +++ b/libinit/init_xiaomi_umi.cpp @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2021 The LineageOS Project + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +#include "vendor_init.h" + +static const variant_info_t umi_info = { + .hwc_value = "", + .sku_value = "", + + .brand = "Xiaomi", + .device = "umi", + .marketname = "", + .model = "Mi 10", + .build_fingerprint = "Xiaomi/umi/umi:11/RKQ1.200826.002/V12.5.10.0.RJBCNXM:user/release-keys", + + .nfc = true, +}; + +void vendor_load_properties() { + set_variant_props(umi_info); + set_dalvik_heap(); +} \ No newline at end of file diff --git a/lineage_lmi.mk b/lineage_umi.mk similarity index 58% rename from lineage_lmi.mk rename to lineage_umi.mk index 253235b..d6d57dc 100644 --- a/lineage_lmi.mk +++ b/lineage_umi.mk @@ -11,18 +11,18 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -# Inherit from lmi device -$(call inherit-product, device/xiaomi/lmi/device.mk) +# Inherit from umi device +$(call inherit-product, device/xiaomi/umi/device.mk) -PRODUCT_NAME := lineage_lmi -PRODUCT_DEVICE := lmi +PRODUCT_NAME := lineage_umi +PRODUCT_DEVICE := umi PRODUCT_MANUFACTURER := Xiaomi -PRODUCT_BRAND := POCO -PRODUCT_MODEL := POCO F2 Pro +PRODUCT_BRAND := Xiaomi +PRODUCT_MODEL := Mi 10 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="lmi-user 11 RKQ1.200826.002 V12.5.3.0.RJKMIXM release-keys" + PRIVATE_BUILD_DESC="umi-user 11 RKQ1.200826.002 V12.5.10.0.RJBCNXM release-keys" -BUILD_FINGERPRINT := Redmi/lmi/lmi:11/RKQ1.200826.002/V12.5.3.0.RJKMIXM:user/release-keys +BUILD_FINGERPRINT := Xiaomi/umi/umi:11/RKQ1.200826.002/V12.5.10.0.RJBCNXM:user/release-keys diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml deleted file mode 100644 index f9eccd6..0000000 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - 227 - diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 6eb0c50..5cc2e99 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,7 +8,7 @@ set -e -export DEVICE=lmi +export DEVICE=umi export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi diff --git a/vendor.prop b/vendor.prop index 43dcc67..72ca0d0 100644 --- a/vendor.prop +++ b/vendor.prop @@ -29,10 +29,7 @@ ro.surface_flinger.use_color_management=true ro.surface_flinger.wcg_composition_dataspace=143261696 # Fingerprint -vendor.lineage.fod.position_x=439 -vendor.lineage.fod.position_y=1655 -vendor.lineage.fod.size=202 +vendor.lineage.fod.position_x=441 +vendor.lineage.fod.position_y=1808 +vendor.lineage.fod.size=197 vendor.lineage.fod.enable=true - -# Motor -vendor.lineage.motor.enable=true