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" am: 9326ba770c am: ebdbfbf539 am: c27bb4650c am: b7caa77823 am: 0fe58b470e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374702

Change-Id: I2185e091f633dfd3a1bbcde1f61c3dd4f11edf8b
This commit is contained in:
Treehugger Robot
2020-07-28 22:40:45 +00:00
committed by Automerger Merge Worker
parent f28f555ae5 0fe58b470e
commit 1ad9fa1abb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/droiddoc.go
View File

@@ -1683,7 +1683,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.

2
java/lint.go
View File

@@ -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")