commit d5c36e1fd7d6b93c30729e3a6dea14338709e118
author Alix Espino <agespino@google.com> Tue Aug 30 17:42:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 30 17:42:10 2022 +0000
tree 3ec5d5adbf2ec47c9ce4a4e739e36c9177d6341c
parent 31302e92665b7578e1ec6ec1eb52669017e75e36
parent 7a4d539e750b5dadcce9a1c6892525745a121823

Merge "Default BuildBrokenClangProperty to empty (false)"

Changes.md

diff --git a/Changes.md b/Changes.md
index d834803..27e52f2 100644
--- a/Changes.md
+++ b/Changes.md
@@ -826,6 +826,7 @@
 go run bpmodify.go -w -m=module_name -remove-property=true -property=clang filepath
 ```
 
+`BUILD_BROKEN_CLANG_PROPERTY` can be used as temporarily workaround
 ### Other envsetup.sh variables  {#other_envsetup_variables}
 
 * ANDROID_TOOLCHAIN

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index a0c16ca..192e96b 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -174,6 +174,7 @@
 
 
 _build_broken_var_list := \
+  BUILD_BROKEN_CLANG_PROPERTY \
   BUILD_BROKEN_DEPFILE \
   BUILD_BROKEN_DUP_RULES \
   BUILD_BROKEN_DUP_SYSPROP \

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 28ceebd..2ff064a 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -275,6 +275,7 @@
 
 $(call add_json_str,  ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL))
 
+$(call add_json_bool, BuildBrokenClangProperty,                 $(filter true,$(BUILD_BROKEN_CLANG_PROPERTY)))
 $(call add_json_bool, BuildBrokenDepfile,                 $(filter true,$(BUILD_BROKEN_DEPFILE)))
 $(call add_json_bool, BuildBrokenEnforceSyspropOwner,     $(filter true,$(BUILD_BROKEN_ENFORCE_SYSPROP_OWNER)))
 $(call add_json_bool, BuildBrokenTrebleSyspropNeverallow, $(filter true,$(BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW)))