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

Merge "Move logic to disable flattening in unbundled app mode from Soong to make."

Browse Source
This commit is contained in:
Martin Stjernholm
2021-05-26 18:21:45 +00:00
committed by Gerrit Code Review
parent 5ac072371e cb3ff1e412
commit 0770a175a1
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

@@ -2020,7 +2020,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.filesInfo = filesInfo a.filesInfo = filesInfo
// Set suffix and primaryApexType depending on the ApexType // Set suffix and primaryApexType depending on the ApexType
buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps() buildFlattenedAsDefault := ctx.Config().FlattenApex()
switch a.properties.ApexType { switch a.properties.ApexType {
case imageApex: case imageApex:
if buildFlattenedAsDefault { if buildFlattenedAsDefault {