diff options
| author | 2020-01-10 20:32:59 +0000 | |
|---|---|---|
| committer | 2020-01-24 22:09:54 +0000 | |
| commit | be9d0d21d1293e022499242b54ea52d5d79a1dfb (patch) | |
| tree | 60293abbc8f447a71a7f5875a7f1c7808a8256a9 /java/dexpreopt.go | |
| parent | f0f747c9492fd4e064abb22dde1de1475cc672db (diff) | |
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.
Bug: 145934348
Test: m
Change-Id: I440a09dba7d337965a196527566b0966a18e3653
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 da6866031..0734b3fce 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) if global.UseApexImage { @@ -189,7 +190,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 |