Make dexpreopt tools available for all java tests
Bug: 177892522
Test: m nothing
Change-Id: I594bddae692ef76dc8c3da504934d0151b13d4c9
diff --git a/java/testing.go b/java/testing.go
index 0b1e2eb..f569834 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -113,6 +113,9 @@
RegisterSdkLibraryBuildComponents(ctx)
RegisterStubsBuildComponents(ctx)
RegisterSystemModulesBuildComponents(ctx)
+
+ // Make sure that any tool related module types needed by dexpreopt have been registered.
+ dexpreopt.RegisterToolModulesForTest(ctx)
}
// Gather the module definitions needed by tests that depend upon code from this package.
@@ -204,6 +207,9 @@
`, extra)
}
+ // Make sure that any tools needed for dexpreopting are defined.
+ bp += dexpreopt.BpToolModulesForTest()
+
// Make sure that the dex_bootjars singleton module is instantiated for the tests.
bp += `
dex_bootjars {