Merge "Always build zipapex's unflattened."

2019-02-13 06:19:54 +00:00 · 2019-02-13 06:19:54 +00:00 · ad0328deb8
parent 8854a5a805 2a2561f8ac
commit ad0328deb8
1 changed files with 1 additions and 1 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@ -966,7 +966,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile and
 	})

 	// Install to $OUT/soong/{target,host}/.../apex
-	if a.installable() && !ctx.Config().FlattenApex() {
+	if a.installable() && (!ctx.Config().FlattenApex() || apexType.zip()) {
 		ctx.InstallFile(android.PathForModuleInstall(ctx, "apex"), ctx.ModuleName()+suffix, a.outputFiles[apexType])
 	}
 }