From 0e23dae5b85825756de4df9331bbe9f3eb5cb7f8 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Mon, 22 Feb 2021 12:36:48 -0500 Subject: [PATCH] soong: Add TARGET_LEGACY_HW_DISK_ENCRYPTION conditional [cafebabe: Move to TWRP soong config namespace] Change-Id: I2c67fe632d415353273839493a86cdd75bd93b23 --- build/soong/Android.bp | 17 +++++++++++++++++ config/BoardConfigSoong.mk | 2 ++ 2 files changed, 19 insertions(+) diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 68193bc..d206b80 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -134,3 +134,20 @@ vold_hw_fde_perf { }, }, } + +soong_config_module_type { + name: "legacy_hw_disk_encryption", + module_type: "cc_defaults", + config_namespace: "twrpGlobalVars", + bool_variables: ["legacy_hw_disk_encryption"], + properties: ["cppflags"], +} + +legacy_hw_disk_encryption { + name: "legacy_hw_disk_encryption_defaults", + soong_config_variables: { + legacy_hw_disk_encryption: { + cppflags: ["-DLEGACY_HW_DISK_ENCRYPTION"], + }, + }, +} diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index b110898..eb8ab50 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -28,6 +28,7 @@ $(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v)))) SOONG_CONFIG_NAMESPACES += twrpGlobalVars SOONG_CONFIG_twrpGlobalVars += \ + legacy_hw_disk_encryption \ target_enforce_ab_ota_partition_list \ target_init_vendor_lib \ supports_hw_fde \ @@ -40,6 +41,7 @@ SOONG_CONFIG_twrpGlobalVars += \ endif # Soong bool variables +SOONG_CONFIG_twrpGlobalVars_legacy_hw_disk_encryption := $(TARGET_LEGACY_HW_DISK_ENCRYPTION) SOONG_CONFIG_twrpGlobalVars_target_enforce_ab_ota_partition_list := $(TARGET_ENFORCE_AB_OTA_PARTITION_LIST) SOONG_CONFIG_twrpGlobalVars_supports_hw_fde := $(TARGET_HW_DISK_ENCRYPTION) SOONG_CONFIG_twrpGlobalVars_supports_hw_fde_perf := $(TARGET_HW_DISK_ENCRYPTION_PERF)