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

Merge "Use aapt2"

Browse Source
This commit is contained in:
Treehugger Robot
2022-08-10 01:21:11 +00:00
committed by Gerrit Code Review
parent 69f5b684d4 fd27c7cbcc
commit 258d296698
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dexpreopt/config.go
View File

@@ -522,7 +522,7 @@ func createGlobalSoongConfig(ctx android.ModuleContext) *GlobalSoongConfig {
return &GlobalSoongConfig{ return &GlobalSoongConfig{
Profman: ctx.Config().HostToolPath(ctx, "profman"), Profman: ctx.Config().HostToolPath(ctx, "profman"),
Dex2oat: dex2oatPathFromDep(ctx), Dex2oat: dex2oatPathFromDep(ctx),
Aapt: ctx.Config().HostToolPath(ctx, "aapt"), Aapt: ctx.Config().HostToolPath(ctx, "aapt2"),
SoongZip: ctx.Config().HostToolPath(ctx, "soong_zip"), SoongZip: ctx.Config().HostToolPath(ctx, "soong_zip"),
Zip2zip: ctx.Config().HostToolPath(ctx, "zip2zip"), Zip2zip: ctx.Config().HostToolPath(ctx, "zip2zip"),
ManifestCheck: ctx.Config().HostToolPath(ctx, "manifest_check"), ManifestCheck: ctx.Config().HostToolPath(ctx, "manifest_check"),
@@ -724,7 +724,7 @@ func globalSoongConfigForTests() *GlobalSoongConfig {
return &GlobalSoongConfig{ return &GlobalSoongConfig{
Profman: android.PathForTesting("profman"), Profman: android.PathForTesting("profman"),
Dex2oat: android.PathForTesting("dex2oat"), Dex2oat: android.PathForTesting("dex2oat"),
Aapt: android.PathForTesting("aapt"), Aapt: android.PathForTesting("aapt2"),
SoongZip: android.PathForTesting("soong_zip"), SoongZip: android.PathForTesting("soong_zip"),
Zip2zip: android.PathForTesting("zip2zip"), Zip2zip: android.PathForTesting("zip2zip"),
ManifestCheck: android.PathForTesting("manifest_check"), ManifestCheck: android.PathForTesting("manifest_check"),

2
java/app.go
View File

@@ -1377,7 +1377,7 @@ func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile a
Flag("--enforce-uses-libraries"). Flag("--enforce-uses-libraries").
Input(inputFile). Input(inputFile).
FlagWithOutput("--enforce-uses-libraries-status ", statusFile). FlagWithOutput("--enforce-uses-libraries-status ", statusFile).
FlagWithInput("--aapt ", ctx.Config().HostToolPath(ctx, "aapt")) FlagWithInput("--aapt ", ctx.Config().HostToolPath(ctx, "aapt2"))
if outputFile != nil { if outputFile != nil {
cmd.FlagWithOutput("-o ", outputFile) cmd.FlagWithOutput("-o ", outputFile)