Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9876e648 authored by Hiroshi Yamauchi's avatar Hiroshi Yamauchi Committed by android-build-merger
Browse files

Merge "Add ART_USE_READ_BARRIER to product variables." am: e34819cc 

am: f9e277e1

Change-Id: I4a0addd85f0e1dcc98250a60084f88be118276cc
parents 2137170e f9e277e1

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ _product_var_list := \ 
    VENDOR_PRODUCT_RESTRICT_VENDOR_FILES \

    VENDOR_EXCEPTION_MODULES \

    VENDOR_EXCEPTION_PATHS \

    PRODUCT_ART_USE_READ_BARRIER \

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -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))

core/soong_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -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); \