| commit | ad0328deb830b1eaaa46f31adcbac43bbb636cee | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 13 06:19:54 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 13 06:19:54 2019 +0000 |
| tree | ba39552214df1ef059d53bc83bf3649f514d2114 | |
| parent | 8854a5a8050ae76583b63226b4ca5967dc5e0972 [diff] | |
| parent | 2a2561f8ac070fef82106e48b0527a32fb0a0de9 [diff] |
Merge "Always build zipapex's unflattened."
diff --git a/apex/apex.go b/apex/apex.go index 0337afb..f4bc1b9 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -966,7 +966,7 @@ }) // 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]) } }