Evolution-X-Devices/device_xiaomi_sm8150-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm8150-common: Migrate partition scheme selection logic to Soong select

Browse Source 
Change-Id: I80a617ea3ec52de799a606463ae33610eb198272
This commit is contained in:
armdebug
2026-01-18 18:26:19 +05:30
committed by firebird11
parent bb5cb8aac9
commit cf4ba3ff5d
3 changed files with 19 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Android.bp
View File

@@ -1,5 +1,5 @@
//
// Copyright (C) 2022-2024 The LineageOS Project
// Copyright (C) 2022-2026 The LineageOS Project
//
// SPDX-License-Identifier: Apache-2.0
//
@@ -7,19 +7,6 @@
soong_namespace {
}
soong_config_module_type {
name: "xiaomi_msmnile_wifi_install_symlink",
module_type: "install_symlink",
config_namespace: "XIAOMI_MSMNILE",
variables: ["PARTITION_SCHEME"],
properties: ["symlink_target"],
}
soong_config_string_variable {
name: "PARTITION_SCHEME",
values: ["dynamic", "legacy", "vab"],
}
install_symlink {
name: "firmware_WCNSS_qcom_cfg.ini_symlink",
vendor: true,
@@ -27,24 +14,14 @@ install_symlink {
symlink_target: "/vendor/etc/wifi/WCNSS_qcom_cfg.ini",
}
xiaomi_msmnile_wifi_install_symlink {
install_symlink {
name: "firmware_wlan_mac.bin_symlink",
vendor: true,
installed_location: "firmware/wlan/qca_cld/wlan_mac.bin",
soong_config_variables: {
PARTITION_SCHEME: {
dynamic: {
symlink_target: "/mnt/vendor/persist/wlan_mac.bin",
},
legacy: {
symlink_target: "/mnt/vendor/persist/wlan_mac.bin",
},
vab: {
symlink_target: "/mnt/vendor/persist/wlan/wlan_mac.bin",
},
conditions_default: {
symlink_target: "/mnt/vendor/persist/wlan_mac.bin",
},
},
},
symlink_target: select(soong_config_variable("XIAOMI_MSMNILE", "PARTITION_SCHEME"), {
"dynamic": "/mnt/vendor/persist/wlan_mac.bin",
"legacy": "/mnt/vendor/persist/wlan_mac.bin",
"vab": "/mnt/vendor/persist/wlan/wlan_mac.bin",
default: "/mnt/vendor/persist/wlan_mac.bin",
}),
}

13
BoardConfigCommon.mk
View File

@@ -181,11 +181,11 @@ ENABLE_VENDOR_RIL_SERVICE := true
# Rootdir
ifeq ($(TARGET_IS_VAB),true)
SOONG_CONFIG_XIAOMI_MSMNILE_PARTITION_SCHEME := vab
$(call soong_config_set,XIAOMI_MSMNILE,PARTITION_SCHEME,vab)
else ifneq ($(TARGET_IS_LEGACY),true)
SOONG_CONFIG_XIAOMI_MSMNILE_PARTITION_SCHEME := dynamic
$(call soong_config_set,XIAOMI_MSMNILE,PARTITION_SCHEME,dynamic)
else
SOONG_CONFIG_XIAOMI_MSMNILE_PARTITION_SCHEME := legacy
$(call soong_config_set,XIAOMI_MSMNILE,PARTITION_SCHEME,legacy)
endif
# Security patch level
@@ -199,13 +199,6 @@ SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
# Soong
SOONG_CONFIG_NAMESPACES += XIAOMI_MSMNILE
SOONG_CONFIG_XIAOMI_MSMNILE := \
PARTITION_SCHEME
SOONG_CONFIG_XIAOMI_MSMNILE_PARTITION_SCHEME ?= dynamic
# Treble
BOARD_VNDK_VERSION := current

39
rootdir/Android.bp
View File

@@ -1,5 +1,5 @@
//
// Copyright (C) 2022 The LineageOS Project
// Copyright (C) 2022-2026 The LineageOS Project
//
// SPDX-License-Identifier: Apache-2.0
//
@@ -54,37 +54,14 @@ sh_binary {
}
// fstab
soong_config_module_type {
name: "xiaomi_msmnile_rootdir_prebuilt_etc",
module_type: "prebuilt_etc",
config_namespace: "XIAOMI_MSMNILE",
variables: ["PARTITION_SCHEME"],
properties: ["src"],
}
soong_config_string_variable {
name: "PARTITION_SCHEME",
values: ["dynamic", "legacy", "vab"],
}
xiaomi_msmnile_rootdir_prebuilt_etc {
prebuilt_etc {
name: "fstab.qcom",
soong_config_variables: {
PARTITION_SCHEME: {
dynamic: {
src: "etc/fstab_dynamic.qcom",
},
legacy: {
src: "etc/fstab_legacy.qcom",
},
vab: {
src: "etc/fstab_AB.qcom",
},
conditions_default: {
src: "etc/fstab_dynamic.qcom",
},
},
},
src: select(soong_config_variable("XIAOMI_MSMNILE", "PARTITION_SCHEME"), {
"dynamic": "etc/fstab_dynamic.qcom",
"legacy": "etc/fstab_legacy.qcom",
"vab": "etc/fstab_AB.qcom",
default: "etc/fstab_dynamic.qcom",
}),
vendor: true,
ramdisk_available: true,
vendor_ramdisk_available: true,