From cb3ff1e412126240141a8a5a8cf104149d4655a2 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Tue, 25 May 2021 00:28:27 +0100
Subject: [PATCH] Move logic to disable flattening in unbundled app mode from
 Soong to make.

Avoids TARGET_FLATTEN_APEX lying about it, so we can trust it in
scripts, e.g. in art/build/apex/runtests.sh.

Test: banchan com.android.art; art/build/apex/runtests.sh
Bug: 179900989
Change-Id: I5361957c448e61634689968424450420479f6111
---
 apex/apex.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apex/apex.go b/apex/apex.go
index 34483272e..926085b4c 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -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 {