From 40f9f3c061e30af857a54f35a5dd670d75e1c87d Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Mon, 20 Jan 2020 18:12:23 +0000 Subject: Reland: 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. This relands https://r.android.com/1211982. Bug: 145934348 Test: m Change-Id: Icb9332a93811d77d2d8b06e983b92501b180a358 --- java/dexpreopt_bootjars_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/dexpreopt_bootjars_test.go') diff --git a/java/dexpreopt_bootjars_test.go b/java/dexpreopt_bootjars_test.go index 4ce30f678..c3b2133a9 100644 --- a/java/dexpreopt_bootjars_test.go +++ b/java/dexpreopt_bootjars_test.go @@ -49,7 +49,7 @@ func TestDexpreoptBootJars(t *testing.T) { pathCtx := android.PathContextForTesting(config) dexpreoptConfig := dexpreopt.GlobalConfigForTests(pathCtx) dexpreoptConfig.BootJars = []string{"foo", "bar", "baz"} - setDexpreoptTestGlobalConfig(config, dexpreoptConfig) + dexpreopt.SetTestGlobalConfig(config, dexpreoptConfig) ctx := testContext() -- cgit v1.2.3-59-g8ed1b