Merge "Don't compress apexes when building in unbundled mode" am: 6681ef3101

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679445

Change-Id: I50aef82fc25f734d14e53809969248c9b796864b
This commit is contained in:
Nikita Ioffe 2021-04-21 22:17:09 +00:00 committed by Automerger Merge Worker
commit aa3aee5205

View file

@ -518,8 +518,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin")
// Figure out if need to compress apex.
compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, false) && !a.testApex
compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, false) && !a.testApex && !ctx.Config().UnbundledBuildApps()
if apexType == imageApex {
////////////////////////////////////////////////////////////////////////////////////
// Step 2: create canned_fs_config which encodes filemode,uid,gid of each files