openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2017-12-12 11:05:06 -08:00
parent 6f822b8b93
commit 59014396ba
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/package_ctx.go
View File

@ -248,11 +248,6 @@ func (p PackageContext) PrefixedExistentPathsForSourcesVariable(
})
}
type RuleParams struct {
blueprint.RuleParams
GomaSupported bool
}
// AndroidStaticRule wraps blueprint.StaticRule and provides a default Pool if none is specified
func (p PackageContext) AndroidStaticRule(name string, params blueprint.RuleParams,
argNames ...string) blueprint.Rule {

6
android/singleton.go
View File

@ -34,7 +34,7 @@ type SingletonContext interface {
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 @@ func (s singletonContextAdaptor) Variable(pctx PackageContext, name, value strin
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) {