diff options
| author | Martin Stjernholm <mast@google.com> | 2020-01-20 18:12:23 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-01-24 22:18:42 +0000 |
| commit | dae8a8042648db84af3720be97845636a2dd57c6 (patch) | |
| tree | 07187997353e499ee41f960b2de9ab62b857ed9c /java/java_test.go | |
| parent | be9d0d21d1293e022499242b54ea52d5d79a1dfb (diff) | |
Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt
package.
Preparation for a future CL that will need to get the make-written
GlobalConfig from within dexpreopt.
Also rename the Load*Config functions to Parse*Config, since they don't
actually load the config files anymore.
Bug: 145934348
Test: m
Change-Id: I71df11c1e042ca8135d273a7263e9539ea3cd68f
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index b4795c065..f047486e6 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -99,7 +99,7 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) { t.Helper() pathCtx := android.PathContextForTesting(config) - setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) + dexpreopt.SetTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) ctx.Register(config) _, errs := ctx.ParseBlueprintsFiles("Android.bp") @@ -118,7 +118,7 @@ func testJavaErrorWithConfig(t *testing.T, pattern string, config android.Config ctx := testContext() pathCtx := android.PathContextForTesting(config) - setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) + dexpreopt.SetTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) ctx.Register(config) _, errs := ctx.ParseBlueprintsFiles("Android.bp") |