diff options
| author | Saeid Farivar Asanjan <farivar@google.com> | 2022-08-08 20:21:26 +0000 |
|---|---|---|
| committer | Saeid Farivar Asanjan <farivar@google.com> | 2022-08-08 20:21:32 +0000 |
| commit | fd27c7cbcc74e76f0bb3dddef52d2c4a51599909 (patch) | |
| tree | aa481f48315c9622424d27b9509197fe3158dfe2 /dexpreopt | |
| parent | f48643dc55af45a6fe182d57ac1ae99176a9c4e0 (diff) | |
Use aapt2
Replace usage of `aapt` with `aapt2`.
Bug: 236602069
Test: m nothing
Change-Id: I0c3b224351aff82fa251fbe83447fd262ab520b1
Diffstat (limited to 'dexpreopt')
| -rw-r--r-- | dexpreopt/config.go | 4 |
1 files changed, 2 insertions, 2 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"), |