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

Merge "Skip passing "--product default" to aapt2" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-02-14 01:20:52 +00:00
committed by Gerrit Code Review
parent 9923e80b3d 10af6edc52
commit d8bab3758b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/app.go
View File

@@ -472,8 +472,9 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
// Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided. // Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided.
autogenerateRRO := proptools.Bool(a.appProperties.Generate_product_characteristics_rro) autogenerateRRO := proptools.Bool(a.appProperties.Generate_product_characteristics_rro)
hasProduct := android.PrefixInList(a.aaptProperties.Aaptflags, "--product") hasProduct := android.PrefixInList(a.aaptProperties.Aaptflags, "--product")
if !autogenerateRRO && !hasProduct && len(ctx.Config().ProductAAPTCharacteristics()) > 0 { characteristics := ctx.Config().ProductAAPTCharacteristics()
aaptLinkFlags = append(aaptLinkFlags, "--product", ctx.Config().ProductAAPTCharacteristics()) if !autogenerateRRO && !hasProduct && len(characteristics) > 0 && characteristics != "default" {
aaptLinkFlags = append(aaptLinkFlags, "--product", characteristics)
} }
if !Bool(a.aaptProperties.Aapt_include_all_resources) { if !Bool(a.aaptProperties.Aapt_include_all_resources) {