Merge "Add ArtUseReadBarrier to ProductVariables." am: 6e2557fa88

am: 8b65b744ad

Change-Id: I4666e294585a119b1368230394c75fd8ac54c285

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] {

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 {