tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always build zipapex's unflattened.

Browse source 
Zipapex's cannot be flattened so do not prevent them from being built
even if TARGET_FLATTEN_APEX is set.

Test: lunch aosp_arm-eng;
      ALLOW_MISSING_DEPENDENCIES=true \
      ./art/tools/build_linux_bionic.sh com.android.runtime.host

Bug: 124333446
Change-Id: I4bef65cce100136a8f7852692e841b62ed9e399f
This commit is contained in:
Alex Light 2019-02-12 16:59:09 -08:00
parent 75569e0f46
commit 2a2561f8ac
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apex/apex.go
View file

@ -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])
}
}