commit 0e2a7399dacfaa67494f1d142dc278e23b91bd20
author Hiroshi Yamauchi <yamauchi@google.com> Tue Jan 24 22:22:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 24 22:22:08 2017 +0000
tree 8c111b93f207ecc9a5c35fa34d76246c0a22ddda
parent 79ff8975b637e66988fff7a21f5a5f6895d55c2d
parent 7254e730a9ff17d538c98ad5fdff000f91491bf6

Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am: 131731fd49
am: 7254e730a9

Change-Id: If496e17ca32097e2b5c5d1b16097ba68f52c2587

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 7b1be47..d987254 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -65,7 +65,7 @@
 	echo '    "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false),'; \
 	echo '    "EnableCFI": $(if $(filter true,$(ENABLE_CFI)),true,false),'; \
 	echo ''; \
-	echo '    "ArtUseReadBarrier": $(if $(filter true,$(PRODUCT_ART_USE_READ_BARRIER)),true,false),'; \
+	echo '    "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \
 	echo ''; \
 	echo '    "BtConfigIncludeDir": "$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)",'; \
 	echo '    "BtHcilpIncluded": "$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)",'; \