Make SingletonContext.Rule take a blueprint.RuleParams
Make the currently-unused SingletonContext.Rule match
ModuleContext.Rule and take a blueprint.RuleParams instead
of an android.RuleParams, and delete android.RuleParams.
Test: m checkbuild
Change-Id: I018685a3dc13f60825b5ba383ef365df2bc98dfc
diff --git a/android/singleton.go b/android/singleton.go
index 87910fd..f577b0a 100644
--- a/android/singleton.go
+++ b/android/singleton.go
@@ -34,7 +34,7 @@
Failed() bool
Variable(pctx PackageContext, name, value string)
- Rule(pctx PackageContext, name string, params RuleParams, argNames ...string) blueprint.Rule
+ Rule(pctx PackageContext, name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule
Build(pctx PackageContext, params BuildParams)
RequireNinjaVersion(major, minor, micro int)
@@ -94,8 +94,8 @@
s.SingletonContext.Variable(pctx.PackageContext, name, value)
}
-func (s singletonContextAdaptor) Rule(pctx PackageContext, name string, params RuleParams, argNames ...string) blueprint.Rule {
- return s.SingletonContext.Rule(pctx.PackageContext, name, params.RuleParams, argNames...)
+func (s singletonContextAdaptor) Rule(pctx PackageContext, name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule {
+ return s.SingletonContext.Rule(pctx.PackageContext, name, params, argNames...)
}
func (s singletonContextAdaptor) Build(pctx PackageContext, params BuildParams) {