aboutsummaryrefslogtreecommitdiffstats
path: root/apex/builder.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2020-06-11 15:33:41 -0700
committerColin Cross <ccross@android.com>2020-06-15 09:46:32 -0700
commita44a6b27f93c7880cd7e59666cbee49395417604 (patch)
tree2dde845f967f7dcbcc63cbfa920696bb49650cdf /apex/builder.go
parent95f7b34e8e9c2bc0859932e5075bdeae9e2594d8 (diff)
downloadbuild_soong-a44a6b27f93c7880cd7e59666cbee49395417604.tar.gz
build_soong-a44a6b27f93c7880cd7e59666cbee49395417604.tar.bz2
build_soong-a44a6b27f93c7880cd7e59666cbee49395417604.zip
Use inclusive language in Android.bp files
Bug: 158889297 Test: m checkbuild Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go
index f751fc66..1f3066e3 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -369,7 +369,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
emitCommands = append(emitCommands, "sort -o "+imageContentFile.String()+" "+imageContentFile.String())
implicitInputs = append(implicitInputs, a.manifestPbOut)
- if a.properties.Whitelisted_files != nil {
+ if a.properties.Allowed_files != nil {
ctx.Build(pctx, android.BuildParams{
Rule: emitApexContentRule,
Implicits: implicitInputs,
@@ -380,7 +380,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
},
})
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")
ctx.Build(pctx, android.BuildParams{