diff options
author | Colin Cross <ccross@android.com> | 2017-11-20 12:14:08 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-11-20 12:23:00 -0800 |
commit | cf31fcfc71918c2b9c2d5d78dde819a719712806 (patch) | |
tree | 514fb4017a579405b925a3e35f3faefa7e067adc /android/package_ctx.go | |
parent | 6693613f1176b71b273be4328c5b245883bc9f8e (diff) | |
download | build_soong-cf31fcfc71918c2b9c2d5d78dde819a719712806.tar.gz build_soong-cf31fcfc71918c2b9c2d5d78dde819a719712806.tar.bz2 build_soong-cf31fcfc71918c2b9c2d5d78dde819a719712806.zip |
Make AndroidRuleFunc callback take a Config
Convert the interface{} to android.Config before calling
the callback.
Test: m checkbuild
Change-Id: Iab1173d3c0bbeff662afcbc1d6ce7c982b6b7720
Diffstat (limited to 'android/package_ctx.go')
-rw-r--r-- | android/package_ctx.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/package_ctx.go b/android/package_ctx.go index 8e37a832..d32e82b2 100644 --- a/android/package_ctx.go +++ b/android/package_ctx.go @@ -198,7 +198,7 @@ type RuleParams struct { // AndroidStaticRule wraps blueprint.StaticRule and provides a default Pool if none is specified func (p AndroidPackageContext) AndroidStaticRule(name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule { - return p.AndroidRuleFunc(name, func(interface{}) (blueprint.RuleParams, error) { + return p.AndroidRuleFunc(name, func(Config) (blueprint.RuleParams, error) { return params, nil }, argNames...) } @@ -210,9 +210,9 @@ func (p AndroidPackageContext) AndroidGomaStaticRule(name string, params bluepri } func (p AndroidPackageContext) AndroidRuleFunc(name string, - f func(interface{}) (blueprint.RuleParams, error), argNames ...string) blueprint.Rule { + f func(Config) (blueprint.RuleParams, error), argNames ...string) blueprint.Rule { return p.PackageContext.RuleFunc(name, func(config interface{}) (blueprint.RuleParams, error) { - params, err := f(config) + params, err := f(config.(Config)) if config.(Config).UseGoma() && params.Pool == nil { // When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the // local parallelism value |