Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a44a6b27 authored Jun 11, 2020 by Colin Cross

Use inclusive language in Android.bp files

Bug: 158889297
Test: m checkbuild
Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2

parent 95f7b34e

apex/apex.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,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

apex/builder.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -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{