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

Use inclusive language in Android.bp files 

Bug: 158889297
Test: m checkbuild
Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2
This commit is contained in:
Colin Cross 2020-06-11 15:33:41 -07:00
parent 95f7b34e8e
commit a44a6b27f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@ -1032,7 +1032,7 @@ type apexBundleProperties struct {
Uses []string Uses []string
// A txt file containing list of files that are allowed to be included in this APEX. // A txt file containing list of files that are allowed to be included in this APEX.
Whitelisted_files *string Allowed_files *string
// package format of this apex variant; could be non-flattened, flattened, or zip. // package format of this apex variant; could be non-flattened, flattened, or zip.
// imageApex, zipApex or flattened // imageApex, zipApex or flattened

4
apex/builder.go
View File

@ -369,7 +369,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
emitCommands = append(emitCommands, "sort -o "+imageContentFile.String()+" "+imageContentFile.String()) emitCommands = append(emitCommands, "sort -o "+imageContentFile.String()+" "+imageContentFile.String())
implicitInputs = append(implicitInputs, a.manifestPbOut) implicitInputs = append(implicitInputs, a.manifestPbOut)
if a.properties.Whitelisted_files != nil { if a.properties.Allowed_files != nil {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: emitApexContentRule, Rule: emitApexContentRule,
Implicits: implicitInputs, Implicits: implicitInputs,
@ -380,7 +380,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
}, },
}) })
implicitInputs = append(implicitInputs, imageContentFile) implicitInputs = append(implicitInputs, imageContentFile)
allowedFilesFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.Whitelisted_files)) allowedFilesFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.Allowed_files))
phonyOutput := android.PathForModuleOut(ctx, a.Name()+"-diff-phony-output") phonyOutput := android.PathForModuleOut(ctx, a.Name()+"-diff-phony-output")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{