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

Merge "Update language to comply with inclusive guidance"

Browse Source
This commit is contained in:
Treehugger Robot
2020-07-28 21:21:31 +00:00
committed by Gerrit Code Review
parent eda8499a3c 20ebfb46fc
commit 9326ba770c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
genrule/genrule.go
View File

@@ -259,9 +259,9 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// If AllowMissingDependencies is enabled, the build will not have stopped when // If AllowMissingDependencies is enabled, the build will not have stopped when
// AddFarVariationDependencies was called on a missing tool, which will result in nonsensical // AddFarVariationDependencies was called on a missing tool, which will result in nonsensical
// "cmd: unknown location label ..." errors later. Add a dummy file to the local label. The // "cmd: unknown location label ..." errors later. Add a placeholder file to the local label.
// command that uses this dummy file will never be executed because the rule will be replaced with // The command that uses this placeholder file will never be executed because the rule will be
// an android.Error rule reporting the missing dependencies. // replaced with an android.Error rule reporting the missing dependencies.
if ctx.Config().AllowMissingDependencies() { if ctx.Config().AllowMissingDependencies() {
for _, tool := range g.properties.Tools { for _, tool := range g.properties.Tools {
if !seenTools[tool] { if !seenTools[tool] {
@@ -292,9 +292,9 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// If AllowMissingDependencies is enabled, the build will not have stopped when // If AllowMissingDependencies is enabled, the build will not have stopped when
// the dependency was added on a missing SourceFileProducer module, which will result in nonsensical // the dependency was added on a missing SourceFileProducer module, which will result in nonsensical
// "cmd: label ":..." has no files" errors later. Add a dummy file to the local label. The // "cmd: label ":..." has no files" errors later. Add a placeholder file to the local label.
// command that uses this dummy file will never be executed because the rule will be replaced with // The command that uses this placeholder file will never be executed because the rule will be
// an android.Error rule reporting the missing dependencies. // replaced with an android.Error rule reporting the missing dependencies.
ctx.AddMissingDependencies(missingDeps) ctx.AddMissingDependencies(missingDeps)
addLocationLabel(in, []string{"***missing srcs " + in + "***"}) addLocationLabel(in, []string{"***missing srcs " + in + "***"})
} else { } else {

2
java/droiddoc.go
View File

@@ -1674,7 +1674,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
impRule := android.NewRuleBuilder() impRule := android.NewRuleBuilder()
impCmd := impRule.Command() impCmd := impRule.Command()
// A dummy action that copies the ninja generated rsp file to a new location. This allows us to // An action that copies the ninja generated rsp file to a new location. This allows us to
// add a large number of inputs to a file without exceeding bash command length limits (which // add a large number of inputs to a file without exceeding bash command length limits (which
// would happen if we use the WriteFile rule). The cp is needed because RuleBuilder sets the // would happen if we use the WriteFile rule). The cp is needed because RuleBuilder sets the
// rsp file to be ${output}.rsp. // rsp file to be ${output}.rsp.

2
java/lint.go
View File

@@ -252,7 +252,7 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext,
return projectXMLPath, configXMLPath, cacheDir, homeDir, deps return projectXMLPath, configXMLPath, cacheDir, homeDir, deps
} }
// generateManifest adds a command to the rule to write a dummy manifest cat contains the // generateManifest adds a command to the rule to write a simple manifest that contains the
// minSdkVersion and targetSdkVersion for modules (like java_library) that don't have a manifest. // minSdkVersion and targetSdkVersion for modules (like java_library) that don't have a manifest.
func (l *linter) generateManifest(ctx android.ModuleContext, rule *android.RuleBuilder) android.Path { func (l *linter) generateManifest(ctx android.ModuleContext, rule *android.RuleBuilder) android.Path {
manifestPath := android.PathForModuleOut(ctx, "lint", "AndroidManifest.xml") manifestPath := android.PathForModuleOut(ctx, "lint", "AndroidManifest.xml")