StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia506214e796b4384dcd24901bfb50d80d6333e10
This commit is contained in:
Nikita Ioffe
2021-04-21 23:09:11 +00:00
committed by Automerger Merge Worker
parent 9edf2f1ee9 910efe3bbe
commit d2685e495d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/builder.go
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