diff options
| author | Alex Light <allight@google.com> | 2019-02-12 16:59:09 -0800 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2019-02-12 17:04:47 -0800 |
| commit | 2a2561f8ac070fef82106e48b0527a32fb0a0de9 (patch) | |
| tree | 0dbbef558369c1c84c9709c4400cb9ecaae1ac04 /apex | |
| parent | 75569e0f4617455bc51c6a5d9f461997a1a3e54f (diff) | |
| download | build_soong-2a2561f8ac070fef82106e48b0527a32fb0a0de9.tar.gz build_soong-2a2561f8ac070fef82106e48b0527a32fb0a0de9.tar.bz2 build_soong-2a2561f8ac070fef82106e48b0527a32fb0a0de9.zip | |
Always build zipapex's unflattened.
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
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 0337afb8..f4bc1b9a 100644 --- 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]) } } |