tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add ART_USE_READ_BARRIER to product variables."

Browse source 
am: e34819ccce

Change-Id: Iaa92156d93110ddfd1a95f677bc02abc6dbcb5c5
This commit is contained in:
Hiroshi Yamauchi 2016-12-20 19:04:19 +00:00 committed by android-build-merger
commit f9e277e1fe
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/product.mk
View file

@ -127,6 +127,7 @@ _product_var_list := \
VENDOR_PRODUCT_RESTRICT_VENDOR_FILES \ VENDOR_PRODUCT_RESTRICT_VENDOR_FILES \
VENDOR_EXCEPTION_MODULES \ VENDOR_EXCEPTION_MODULES \
VENDOR_EXCEPTION_PATHS \ VENDOR_EXCEPTION_PATHS \
PRODUCT_ART_USE_READ_BARRIER \

4
core/product_config.mk
View file

@ -423,3 +423,7 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\
$(eval cf := $(subst $(_PSMC_SP_PLACE_HOLDER),$(space),$(cf)))\ $(eval cf := $(subst $(_PSMC_SP_PLACE_HOLDER),$(space),$(cf)))\
$(eval SANITIZER.$(TARGET_PRODUCT).$(m).CONFIG := $(cf)))) $(eval SANITIZER.$(TARGET_PRODUCT).$(m).CONFIG := $(cf))))
_psmc_modules := _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))

4
core/soong_config.mk
View file

@ -62,7 +62,9 @@ $(SOONG_VARIABLES): FORCE
echo ' "CrossHost": "$(HOST_CROSS_OS)",'; \ echo ' "CrossHost": "$(HOST_CROSS_OS)",'; \
echo ' "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \ echo ' "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \
echo ' "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_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); \ echo '}') > $(SOONG_VARIABLES_TMP); \
if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \ if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \
mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \ mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \