From e2a106353f47421b602494b00a8803779a4e325d Mon Sep 17 00:00:00 2001
From: Hiroshi Yamauchi <yamauchi@google.com>
Date: Mon, 19 Dec 2016 13:44:41 -0800
Subject: [PATCH] Add ArtUseReadBarrier to ProductVariables.

Bug: 33492005
Test: top-level angler build.
Change-Id: Ib04284bac923a143038655d495bcbacaabf61440
---
 android/config.go   | 4 ++++
 android/variable.go | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/android/config.go b/android/config.go
index 8f531ccd4..7d268fc4b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -435,6 +435,10 @@ func (c *config) LibartImgDeviceBaseAddress() string {
 	}
 }
 
+func (c *config) ArtUseReadBarrier() bool {
+	return Bool(c.ProductVariables.ArtUseReadBarrier)
+}
+
 func (c *deviceConfig) Arches() []Arch {
 	var arches []Arch
 	for _, target := range c.config.Targets[Device] {
diff --git a/android/variable.go b/android/variable.go
index f00637023..e6abee625 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -136,6 +136,8 @@ type productVariables struct {
 	SanitizeHost       []string `json:",omitempty"`
 	SanitizeDevice     []string `json:",omitempty"`
 	SanitizeDeviceArch []string `json:",omitempty"`
+
+	ArtUseReadBarrier *bool `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {