Merge "Rename Soong variable FlattenApex as Flatten_apex."

This commit is contained in:
Roland Levillain 2019-08-21 19:55:47 +00:00 committed by Gerrit Code Review
commit 5f576375fa
2 changed files with 2 additions and 2 deletions

View file

@ -1077,7 +1077,7 @@ func (c *config) ExcludeDraftNdkApis() bool {
}
func (c *config) FlattenApex() bool {
return Bool(c.productVariables.FlattenApex)
return Bool(c.productVariables.Flatten_apex)
}
func (c *config) EnforceSystemCertificate() bool {

View file

@ -277,7 +277,7 @@ type productVariables struct {
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"`