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

parent 75569e0f

apex/apex.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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])
		}
		}