From cbd62d07d4ff992228e0aeb5a4e0ab95100b3a2c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 11 Jun 2020 15:33:41 -0700 Subject: [PATCH] Use inclusive language in Android.bp files Test: m checkbuild Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2 Merged-In: Id9efbd99be54b191193eae1c5672230ca54cf1d2 --- apex/apex.go | 2 +- apex/builder.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 3fef1ee41..065e7e2fb 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -994,7 +994,7 @@ type apexBundleProperties struct { Uses []string // 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. // imageApex, zipApex or flattened diff --git a/apex/builder.go b/apex/builder.go index 129358834..53c119391 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -391,7 +391,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, @@ -402,7 +402,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{