From 56507b4e0dcd5b4281826e0545b59443d714f39c Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Wed, 24 Jun 2020 22:31:36 +0100
Subject: [PATCH] Disable flattening only for unbundled apps.

This allows the unbundled master-art branch to still use flattened
APEXes in its test builds.

Bug: 159109002
Test: art/build/apex/runtests.sh on master-art
Test: m nothing
Change-Id: I768c6b7f5afbc348cd7730e4ba96507678434778
---
 apex/apex.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apex/apex.go b/apex/apex.go
index 58cbb13e9..e21cc5bcd 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1866,7 +1866,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
 }
 
 func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
-	buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild()
+	buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps()
 	switch a.properties.ApexType {
 	case imageApex:
 		if buildFlattenedAsDefault {