diff --git a/Changes.md b/Changes.md
index d834803aae..27e52f2630 100644
--- a/Changes.md
+++ b/Changes.md
@@ -826,6 +826,7 @@ property from affected Android.bp files using bpmodify.
 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
diff --git a/core/board_config.mk b/core/board_config.mk
index a0c16ca7b5..192e96b5a5 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -174,6 +174,7 @@ _board_strip_list += ODM_MANIFEST_SKUS
 
 
 _build_broken_var_list := \
+  BUILD_BROKEN_CLANG_PROPERTY \
   BUILD_BROKEN_DEPFILE \
   BUILD_BROKEN_DUP_RULES \
   BUILD_BROKEN_DUP_SYSPROP \
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 28ceebdc34..2ff064a408 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -275,6 +275,7 @@ $(call add_json_str,  PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR))
 
 $(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)))