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

[DO NOT MERGE] Run non-RBE supported actions in the local pool when USE_RBE is set. 

Bug: 143938974
Test: ran CTS build at -j500 successfully.

Bug: b/166182389
Change-Id: I55074bd67308cd716972e24fb56a20bc393d5d9d
Merged-In: I55074bd67308cd716972e24fb56a20bc393d5d9d
This commit is contained in:
Ramy Medhat 2019-11-04 18:16:11 -05:00 committed by Kousik Kumar
parent 80059e69c7
commit c0d95df5d0
7 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/module.go
View File

@ -1001,9 +1001,9 @@ func (a *androidModuleContext) Variable(pctx PackageContext, name, value string)
func (a *androidModuleContext) Rule(pctx PackageContext, name string, params blueprint.RuleParams,
argNames ...string) blueprint.Rule {
if a.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
if (a.config.UseGoma() || a.config.UseRBE()) && params.Pool == nil {
// When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by goma/RBE, restrict
// jobs to the local parallelism value
params.Pool = localPool
}

40
android/package_ctx.go
View File

@ -115,9 +115,9 @@ func (p PackageContext) RuleFunc(name string,
if len(ctx.errors) > 0 {
return params, ctx.errors[0]
}
if ctx.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
if (ctx.Config().UseGoma() || ctx.Config().UseRBE()) && params.Pool == nil {
// When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by
// goma/RBE, restrict jobs to the local parallelism value
params.Pool = localPool
}
return params, nil
@ -254,9 +254,35 @@ func (p PackageContext) StaticRule(name string, params blueprint.RuleParams,
}, argNames...)
}
// AndroidGomaStaticRule wraps blueprint.StaticRule but uses goma's parallelism if goma is enabled
func (p PackageContext) AndroidGomaStaticRule(name string, params blueprint.RuleParams,
// RemoteRuleSupports selects if a AndroidRemoteStaticRule supports goma, RBE, or both.
type RemoteRuleSupports int
const (
SUPPORTS_NONE = 0
SUPPORTS_GOMA = 1 << iota
SUPPORTS_RBE = 1 << iota
SUPPORTS_BOTH = SUPPORTS_GOMA | SUPPORTS_RBE
)
// AndroidRemoteStaticRule wraps blueprint.StaticRule but uses goma or RBE's parallelism if goma or RBE are enabled
// and the appropriate SUPPORTS_* flag is set.
func (p PackageContext) AndroidRemoteStaticRule(name string, supports RemoteRuleSupports, params blueprint.RuleParams,
argNames ...string) blueprint.Rule {
// bypass android.PackageContext.StaticRule so that Pool does not get set to local_pool.
return p.PackageContext.StaticRule(name, params, argNames...)
return p.PackageContext.RuleFunc(name, func(config interface{}) (blueprint.RuleParams, error) {
ctx := &configErrorWrapper{p, config.(Config), nil}
if ctx.Config().UseGoma() && supports&SUPPORTS_GOMA == 0 {
// When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the
// local parallelism value
params.Pool = localPool
}
if ctx.Config().UseRBE() && supports&SUPPORTS_RBE == 0 {
// When USE_RBE=true is set and the rule is not supported by RBE, restrict jobs to the
// local parallelism value
params.Pool = localPool
}
return params, nil
}, argNames...)
}

6
android/singleton.go
View File

@ -127,9 +127,9 @@ func (s *singletonContextAdaptor) Variable(pctx PackageContext, name, value stri
}
func (s *singletonContextAdaptor) Rule(pctx PackageContext, name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule {
if s.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
if (s.Config().UseGoma() || s.Config().UseRBE()) && params.Pool == nil {
// When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by goma/RBE, restrict
// jobs to the local parallelism value
params.Pool = localPool
}
rule := s.SingletonContext.Rule(pctx.PackageContext, name, params, argNames...)

2
bpf/bpf.go
View File

@ -33,7 +33,7 @@ func init() {
var (
pctx = android.NewPackageContext("android/soong/bpf")
cc = pctx.AndroidGomaStaticRule("cc",
cc = pctx.AndroidRemoteStaticRule("cc", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,

4
cc/builder.go
View File

@ -46,7 +46,7 @@ var (
var (
pctx = android.NewPackageContext("android/soong/cc")
cc = pctx.AndroidGomaStaticRule("cc",
cc = pctx.AndroidRemoteStaticRule("cc", android.SUPPORTS_BOTH,
blueprint.RuleParams{
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
@ -55,7 +55,7 @@ var (
},
"ccCmd", "cFlags")
ccNoDeps = pctx.AndroidGomaStaticRule("ccNoDeps",
ccNoDeps = pctx.AndroidRemoteStaticRule("ccNoDeps", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: "$relPwd ${config.CcWrapper}$ccCmd -c $cFlags -o $out $in",
CommandDeps: []string{"$ccCmd"},

2
java/builder.go
View File

@ -38,7 +38,7 @@ var (
// this, all java rules write into separate directories and then are combined into a .jar file
// (if the rule produces .class files) or a .srcjar file (if the rule produces .java files).
// .srcjar files are unzipped into a temporary directory when compiled with javac.
javac = pctx.AndroidGomaStaticRule("javac",
javac = pctx.AndroidRemoteStaticRule("javac", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

4
java/kotlin.go
View File

@ -25,7 +25,7 @@ import (
"github.com/google/blueprint"
)
var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" && mkdir -p "$classesDir" "$srcJarDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +
@ -74,7 +74,7 @@ func kotlinCompile(ctx android.ModuleContext, outputFile android.WritablePath,
})
}
var kapt = pctx.AndroidGomaStaticRule("kapt",
var kapt = pctx.AndroidRemoteStaticRule("kapt", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$srcJarDir" "$kotlinBuildFile" "$kaptDir" && mkdir -p "$srcJarDir" "$kaptDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +