From 7b2e6f3ed7c8b871195f344d0efeecb59a202e8f Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Sat, 25 Jan 2020 01:44:30 +0000 Subject: Revert "Get the dex2oat host tool path from module dependency on..." Revert submission 1211982-dex2oat-soong-dep Reason for revert: Build failures. See b/148312086. Reverted Changes: Ibc427a9a8: Make dex2oat(d) visible for use as implicit dexpre... I71df11c1e: Move the Once cache for dexpreopt.GlobalConfig int... I38317f2d5: Get the dex2oat host tool path from module depende... I440a09dba: Separate dexpreopt.GlobalSoongConfig to allow inde... Bug: 148312086 Bug: 145934348 Exempt-From-Owner-Approval: Plain revert Change-Id: I0cf6fef04434fd3c0b7957ee9abdcaabeb20b9d8 --- java/java_test.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index b724b4de2..f047486e6 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -57,8 +57,6 @@ func TestMain(m *testing.M) { } func testConfig(env map[string]string, bp string, fs map[string][]byte) android.Config { - bp += dexpreopt.BpToolModulesForTest() - config := TestConfig(buildDir, env, bp, fs) // Set up the global Once cache used for dexpreopt.GlobalSoongConfig, so that @@ -94,8 +92,6 @@ func testContext() *android.TestContext { cc.RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterModuleType("ndk_prebuilt_shared_stl", cc.NdkPrebuiltSharedStlFactory) - dexpreopt.RegisterToolModulesForTest(ctx) - return ctx } -- cgit v1.2.3-59-g8ed1b