commit 595b1f0e72404c89d6e38e9c707028986682b61b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 16 14:41:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 14:41:08 2024 +0000
tree 8f68f2a19f8d9ed39ebad8d972ef1396ac4b21d0
parent 83de8086609518e81ab4011f23f7f2891e0af6e3
parent d8535ef949be1e0ee18c597cc56082c1f98b0ad3

Merge "Add soong config variables ADDITIONAL_M4DEFS for file_contexts.bin" 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 fccc2a5..e5a8e44 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -40,6 +40,8 @@
 $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
 $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)
 
+$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))
+
 # For Sanitizers
 $(call soong_config_set_bool,ANDROID,ASAN_ENABLED,$(if $(filter address,$(SANITIZE_TARGET)),true,false))
 $(call soong_config_set_bool,ANDROID,HWASAN_ENABLED,$(if $(filter hwaddress,$(SANITIZE_TARGET)),true,false))