From e4b5342d43d544871257c0422d52cdcad323eb5e Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Sat, 25 Jan 2020 01:44:30 +0000 Subject: Revert "Separate dexpreopt.GlobalSoongConfig to allow independen..." 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: Ice3990225635a737e49e9aed7373f06516fccea3 --- java/java_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index b4795c065..a2788cb8e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -57,13 +57,7 @@ func TestMain(m *testing.M) { } func testConfig(env map[string]string, bp string, fs map[string][]byte) android.Config { - config := TestConfig(buildDir, env, bp, fs) - - // Set up the global Once cache used for dexpreopt.GlobalSoongConfig, so that - // it doesn't create a real one, which would fail. - _ = dexpreopt.GlobalSoongConfigForTests(config) - - return config + return TestConfig(buildDir, env, bp, fs) } func testContext() *android.TestContext { -- cgit v1.2.3-59-g8ed1b