commit 60f44e93a832b4b91832d7260305d9d3c95d9719
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 18 05:52:52 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 18 05:52:52 2024 +0000
tree 39f316e410a64748ae4fed8f4ddd8d71bed22e65
parent 083e56837b772558a591d5355656f07d9f913bc5
parent 39f5cc4153b40dddae3ca8b0615879e89523c0ef

Merge "Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 366f9b4..b393886 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -37,6 +37,10 @@
 $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
 $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)
 
+# For Sanitizers
+$(call soong_config_set_bool,ANDROID,ASAN_ENABLED,$(if $(filter address,$(SANITIZE_TARGET)),true,false))
+$(call soong_config_set_bool,ANDROID,SANITIZE_TARGET_SYSTEM_ENABLED,$(if $(filter true,$(SANITIZE_TARGET_SYSTEM)),true,false))
+
 # PRODUCT_PRECOMPILED_SEPOLICY defaults to true. Explicitly check if it's "false" or not.
 $(call soong_config_set_bool,ANDROID,PRODUCT_PRECOMPILED_SEPOLICY,$(if $(filter false,$(PRODUCT_PRECOMPILED_SEPOLICY)),false,true))