diff options
| author | Colin Cross <ccross@android.com> | 2019-02-04 11:22:08 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-02-06 01:52:41 +0000 |
| commit | 571cccfcbc795f2bc955ca7fb3ac09085b360e09 (patch) | |
| tree | 16da47a7ce728a0dfec6d48b1ef89c2cf72341f3 /java/dexpreopt.go | |
| parent | 5cb5b093d1f49a160b6ef2994c6bce07793a7d2d (diff) | |
| download | android_build_soong-571cccfcbc795f2bc955ca7fb3ac09085b360e09.tar.gz android_build_soong-571cccfcbc795f2bc955ca7fb3ac09085b360e09.tar.bz2 android_build_soong-571cccfcbc795f2bc955ca7fb3ac09085b360e09.zip | |
Prepare for a type-safe OnceKey
Add an opaque OnceKey type and use it for all calls to Once in
build/soong. A future patch will convert the arguments to
Once* to OnceKey once users outside build/soong have been updated.
Test: onceper_test.go
Change-Id: Ifcb338e6e603e804e507203c9508d30ffb2df966
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index bb72b7de..33c46f4f 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -81,12 +81,14 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.ModuleContext) bool { return false } +var dexpreoptGlobalConfigKey = android.NewOnceKey("DexpreoptGlobalConfig") + func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) android.ModuleOutPath { if d.dexpreoptDisabled(ctx) { return dexJarFile } - globalConfig := ctx.Config().Once("DexpreoptGlobalConfig", func() interface{} { + globalConfig := ctx.Config().Once(dexpreoptGlobalConfigKey, func() interface{} { if f := ctx.Config().DexpreoptGlobalConfig(); f != "" { ctx.AddNinjaFileDeps(f) globalConfig, err := dexpreopt.LoadGlobalConfig(f) |