diff options
| author | Hans Boehm <hboehm@google.com> | 2020-01-25 01:44:30 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-01-27 13:44:24 +0000 |
| commit | e4b5342d43d544871257c0422d52cdcad323eb5e (patch) | |
| tree | 24390e5343376ddddce10ebeb0c622b2fe5644aa /java/java_test.go | |
| parent | 453bf0985351826b7ed64e3b20ccc4965141c4de (diff) | |
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 8 |
1 files changed, 1 insertions, 7 deletions
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 { |