From fd27c7cbcc74e76f0bb3dddef52d2c4a51599909 Mon Sep 17 00:00:00 2001 From: Saeid Farivar Asanjan Date: Mon, 8 Aug 2022 20:21:26 +0000 Subject: [PATCH] Use aapt2 Replace usage of `aapt` with `aapt2`. Bug: 236602069 Test: m nothing Change-Id: I0c3b224351aff82fa251fbe83447fd262ab520b1 --- dexpreopt/config.go | 4 ++-- java/app.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 64cd46a76..eefda197c 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -522,7 +522,7 @@ func createGlobalSoongConfig(ctx android.ModuleContext) *GlobalSoongConfig { return &GlobalSoongConfig{ Profman: ctx.Config().HostToolPath(ctx, "profman"), Dex2oat: dex2oatPathFromDep(ctx), - Aapt: ctx.Config().HostToolPath(ctx, "aapt"), + Aapt: ctx.Config().HostToolPath(ctx, "aapt2"), SoongZip: ctx.Config().HostToolPath(ctx, "soong_zip"), Zip2zip: ctx.Config().HostToolPath(ctx, "zip2zip"), ManifestCheck: ctx.Config().HostToolPath(ctx, "manifest_check"), @@ -724,7 +724,7 @@ func globalSoongConfigForTests() *GlobalSoongConfig { return &GlobalSoongConfig{ Profman: android.PathForTesting("profman"), Dex2oat: android.PathForTesting("dex2oat"), - Aapt: android.PathForTesting("aapt"), + Aapt: android.PathForTesting("aapt2"), SoongZip: android.PathForTesting("soong_zip"), Zip2zip: android.PathForTesting("zip2zip"), ManifestCheck: android.PathForTesting("manifest_check"), diff --git a/java/app.go b/java/app.go index c3699784c..1995f13be 100755 --- a/java/app.go +++ b/java/app.go @@ -1377,7 +1377,7 @@ func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile a Flag("--enforce-uses-libraries"). Input(inputFile). FlagWithOutput("--enforce-uses-libraries-status ", statusFile). - FlagWithInput("--aapt ", ctx.Config().HostToolPath(ctx, "aapt")) + FlagWithInput("--aapt ", ctx.Config().HostToolPath(ctx, "aapt2")) if outputFile != nil { cmd.FlagWithOutput("-o ", outputFile)