diff options
| author | Martin Stjernholm <mast@google.com> | 2020-01-20 18:12:23 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-02-13 17:46:48 +0000 |
| commit | 40f9f3c061e30af857a54f35a5dd670d75e1c87d (patch) | |
| tree | a59f6775bffa01f08f04072f0ea3385251041b25 /java/java.go | |
| parent | 75a48d8ae23c017dadc7ac025b45f5a1aebfbe4c (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index d84d16272..b20f5f244 100644 --- a/java/java.go +++ b/java/java.go @@ -105,7 +105,7 @@ func DexpreoptedSystemServerJars(config android.Config) *[]string { // order (which is partial and non-deterministic). This pass adds additional dependencies between // jars, making the order total and deterministic. It also constructs a global ordered list. func systemServerJarsDepsMutator(ctx android.BottomUpMutatorContext) { - jars := dexpreopt.NonUpdatableSystemServerJars(ctx, dexpreoptGlobalConfig(ctx)) + jars := dexpreopt.NonUpdatableSystemServerJars(ctx, dexpreopt.GetGlobalConfig(ctx)) name := ctx.ModuleName() if android.InList(name, jars) { dexpreoptedSystemServerJarsLock.Lock() |