From 20ebfb46fc975602eba6b6915ce5e7ae8a7869e3 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Tue, 28 Jul 2020 11:32:07 -0700 Subject: [PATCH] Update language to comply with inclusive guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: Ie1d0d63d27f1b1b48680922b7202aa6df04f4696 --- genrule/genrule.go | 12 ++++++------ java/droiddoc.go | 2 +- java/lint.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/genrule/genrule.go b/genrule/genrule.go index 00baa57cb..1cec2893a 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -259,9 +259,9 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { // If AllowMissingDependencies is enabled, the build will not have stopped when // 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 - // command that uses this dummy file will never be executed because the rule will be replaced with - // an android.Error rule reporting the missing dependencies. + // "cmd: unknown location label ..." errors later. Add a placeholder file to the local label. + // The command that uses this placeholder file will never be executed because the rule will be + // replaced with an android.Error rule reporting the missing dependencies. if ctx.Config().AllowMissingDependencies() { for _, tool := range g.properties.Tools { 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 // 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 - // command that uses this dummy file will never be executed because the rule will be replaced with - // an android.Error rule reporting the missing dependencies. + // "cmd: label ":..." has no files" errors later. Add a placeholder file to the local label. + // The command that uses this placeholder file will never be executed because the rule will be + // replaced with an android.Error rule reporting the missing dependencies. ctx.AddMissingDependencies(missingDeps) addLocationLabel(in, []string{"***missing srcs " + in + "***"}) } else { diff --git a/java/droiddoc.go b/java/droiddoc.go index 190a05237..935b83915 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1674,7 +1674,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { impRule := android.NewRuleBuilder() 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 // would happen if we use the WriteFile rule). The cp is needed because RuleBuilder sets the // rsp file to be ${output}.rsp. diff --git a/java/lint.go b/java/lint.go index 639106793..1bf7f69fd 100644 --- a/java/lint.go +++ b/java/lint.go @@ -252,7 +252,7 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext, 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. func (l *linter) generateManifest(ctx android.ModuleContext, rule *android.RuleBuilder) android.Path { manifestPath := android.PathForModuleOut(ctx, "lint", "AndroidManifest.xml")