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

Merge "Disable flattening only for unbundled apps." am: c4fe0dd3cc

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

Change-Id: I252054d7bcd670da0b999d93344c8043cea25d46
This commit is contained in:
Martin Stjernholm
2020-06-25 14:05:30 +00:00
committed by Automerger Merge Worker
parent a3cba8ecd9 c4fe0dd3cc
commit a77dc06b2b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1885,7 +1885,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
} }
func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild() buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps()
switch a.properties.ApexType { switch a.properties.ApexType {
case imageApex: case imageApex:
if buildFlattenedAsDefault { if buildFlattenedAsDefault {