openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Disable flattening only for unbundled apps."

This commit is contained in:
Martin Stjernholm 2020-06-25 13:49:30 +00:00 committed by Gerrit Code Review
parent 670ed3d97d 56507b4e0d
commit c4fe0dd3cc
1 changed files with 1 additions and 1 deletions
Show Stats 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 {