Merge "Don't compress apexes when building in unbundled mode"

This commit is contained in:
Nikita Ioffe 2021-04-21 21:50:32 +00:00 committed by Gerrit Code Review
commit 6681ef3101
1 changed files with 1 additions and 2 deletions

View File

@ -518,8 +518,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin") prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin")
// Figure out if need to compress apex. // 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 { if apexType == imageApex {
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
// Step 2: create canned_fs_config which encodes filemode,uid,gid of each files // Step 2: create canned_fs_config which encodes filemode,uid,gid of each files