From a386321345b10d554e6696e58d9a3786cf258718 Mon Sep 17 00:00:00 2001
From: Roland Levillain <rpl@google.com>
Date: Mon, 12 Aug 2019 19:56:16 +0100
Subject: [PATCH] Rename Soong variable `FlattenApex` as `Flatten_apex`.

This is so that it can be used as a Soong/Blueprint property.

Test: m
Bug: 139277987
Change-Id: I8840811fde92a71e97ed100aacfc7fbb003580d0
---
 android/config.go   | 2 +-
 android/variable.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/config.go b/android/config.go
index 72372efe6..cb1bdf52d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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 {
diff --git a/android/variable.go b/android/variable.go
index 8886bae20..0931db852 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -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"`