Merge "Move logic to disable flattening in unbundled app mode from Soong to make."
This commit is contained in:
commit
0770a175a1
1 changed files with 1 additions and 1 deletions
|
@ -2020,7 +2020,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
a.filesInfo = filesInfo
|
||||
|
||||
// Set suffix and primaryApexType depending on the ApexType
|
||||
buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps()
|
||||
buildFlattenedAsDefault := ctx.Config().FlattenApex()
|
||||
switch a.properties.ApexType {
|
||||
case imageApex:
|
||||
if buildFlattenedAsDefault {
|
||||
|
|
Loading…
Reference in a new issue