StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make AndroidRuleFunc callback take a Config

Browse Source 
Convert the interface{} to android.Config before calling
the callback.

Test: m checkbuild
Change-Id: Iab1173d3c0bbeff662afcbc1d6ce7c982b6b7720
This commit is contained in:
Colin Cross
2017-11-20 12:14:08 -08:00
parent 6693613f11
commit cf31fcfc71
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/package_ctx.go
View File

@@ -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