From 64594c4f53357a5037cf026387f8b5ab2e24bafe Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Thu, 15 Dec 2016 16:00:41 -0800 Subject: [PATCH] Add ART_USE_READ_BARRIER to product variables. Bug: 33492005 Test: top-level build for angler. Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8 --- core/product.mk | 1 + core/product_config.mk | 4 ++++ core/soong_config.mk | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/product.mk b/core/product.mk index e2a53394ad..93d42fd1f6 100644 --- a/core/product.mk +++ b/core/product.mk @@ -127,6 +127,7 @@ _product_var_list := \ VENDOR_PRODUCT_RESTRICT_VENDOR_FILES \ VENDOR_EXCEPTION_MODULES \ VENDOR_EXCEPTION_PATHS \ + PRODUCT_ART_USE_READ_BARRIER \ diff --git a/core/product_config.mk b/core/product_config.mk index ea20bcb271..295e2635d9 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -423,3 +423,7 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\ $(eval cf := $(subst $(_PSMC_SP_PLACE_HOLDER),$(space),$(cf)))\ $(eval SANITIZER.$(TARGET_PRODUCT).$(m).CONFIG := $(cf)))) _psmc_modules := + +# Make this art variable visible to soong_config.mk. +PRODUCT_ART_USE_READ_BARRIER := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ART_USE_READ_BARRIER)) diff --git a/core/soong_config.mk b/core/soong_config.mk index 94cd4a087b..f4885663e8 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -62,7 +62,9 @@ $(SOONG_VARIABLES): FORCE echo ' "CrossHost": "$(HOST_CROSS_OS)",'; \ echo ' "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \ echo ' "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)",'; \ - echo ' "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false)'; \ + echo ' "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false),'; \ + echo ''; \ + echo ' "ArtUseReadBarrier": $(if $(filter true,$(PRODUCT_ART_USE_READ_BARRIER)),true,false)'; \ echo '}') > $(SOONG_VARIABLES_TMP); \ if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \ mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \