diff options
| author | 2020-01-10 20:32:59 +0000 | |
|---|---|---|
| committer | 2020-02-13 17:21:13 +0000 | |
| commit | 75a48d8ae23c017dadc7ac025b45f5a1aebfbe4c (patch) | |
| tree | 078c89c9f86ffe3f2bf9cc0f15242644971408c4 /java/dexpreopt.go | |
| parent | 394b9b379a9f84d26089b44a4eb130789422435f (diff) | |
Reland: Separate dexpreopt.GlobalSoongConfig to allow independent
caching of it.
Introduce a Once cache for GlobalSoongConfig to allow it to get binary
tool paths from ordinary module dependencies (coming in a future CL)
that are then reused in singletons.
This relands https://r.android.com/1205729.
Bug: 145934348
Test: m
Change-Id: I039d6e204bee5ddc16d8e2d85057fbec20e326fe
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index c81e199c6..ec0b5c659 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -104,6 +104,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo return dexJarFile } + globalSoong := dexpreopt.GetGlobalSoongConfig(ctx) global := dexpreoptGlobalConfig(ctx) bootImage := defaultBootImageConfig(ctx) dexFiles := bootImage.dexPathsDeps.Paths() @@ -191,7 +192,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo PresignedPrebuilt: d.isPresignedPrebuilt, } - dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, global, dexpreoptConfig) + dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, globalSoong, global, dexpreoptConfig) if err != nil { ctx.ModuleErrorf("error generating dexpreopt rule: %s", err.Error()) return dexJarFile |