Use aapt2
Replace usage of `aapt` with `aapt2`. Bug: 236602069 Test: m nothing Change-Id: I0c3b224351aff82fa251fbe83447fd262ab520b1
This commit is contained in:
@@ -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"),
|
||||
|
Reference in New Issue
Block a user