commit 5724333e226e7711eabb196f2051ee282523b528
author Yi Kong <yikong@google.com> Wed Aug 21 21:11:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 21 21:11:12 2019 +0000
tree 9f7a6959c1ad8d627be7b0975fa0c5c120bb3f28
parent 5f576375fa1c09d1ea89fd4079c3a7a4e7155d3b
parent 20233a43db7f39c873b387f457e21713a560a08b

Merge "Disable new pass manager for ASAN build"

android/config.go

diff --git a/android/config.go b/android/config.go
index 72372ef..cb1bdf5 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1077,7 +1077,7 @@
 }
 
 func (c *config) FlattenApex() bool {
-	return Bool(c.productVariables.FlattenApex)
+	return Bool(c.productVariables.Flatten_apex)
 }
 
 func (c *config) EnforceSystemCertificate() bool {

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 8886bae..0931db8 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -277,7 +277,7 @@
 	Ndk_abis               *bool `json:",omitempty"`
 	Exclude_draft_ndk_apis *bool `json:",omitempty"`
 
-	FlattenApex *bool `json:",omitempty"`
+	Flatten_apex *bool `json:",omitempty"`
 
 	DexpreoptGlobalConfig *string `json:",omitempty"`