From 869a43f5d5df94de363c3e05b80d0d98fa30ed58 Mon Sep 17 00:00:00 2001 From: nebrassy Date: Mon, 7 Jun 2021 17:20:36 +0200 Subject: [PATCH] add vendor_init Change-Id: Ic8e2db11fc0dd18259a009c2d34c34a4d5c3f2e4 --- build/soong/Android.bp | 17 +++++++++++++++++ config/BoardConfigSoong.mk | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 428f14d..daad30e 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -49,6 +49,23 @@ cc_library_headers { recovery_available: true, } +soong_config_module_type { + name: "vendor_init", + module_type: "cc_defaults", + config_namespace: "twrpGlobalVars", + value_variables: ["target_init_vendor_lib"], + properties: ["whole_static_libs"], +} + +vendor_init { + name: "vendor_init_defaults", + soong_config_variables: { + target_init_vendor_lib: { + whole_static_libs: ["%s"], + }, + }, +} + soong_config_module_type { name: "enforce_ab_ota_partition_list", module_type: "cc_defaults", diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index 6ff52ec..45e677b 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -28,7 +28,14 @@ $(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v)))) SOONG_CONFIG_NAMESPACES += twrpGlobalVars SOONG_CONFIG_twrpGlobalVars += \ - target_enforce_ab_ota_partition_list + target_enforce_ab_ota_partition_list \ + target_init_vendor_lib # Soong bool variables SOONG_CONFIG_twrpGlobalVars_target_enforce_ab_ota_partition_list := $(TARGET_ENFORCE_AB_OTA_PARTITION_LIST) + +# Set default values +TARGET_INIT_VENDOR_LIB ?= vendor_init + +# Soong value variables +SOONG_CONFIG_twrpGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)