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

Commit c02c98b8 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

[cc/sanitize] Deprecate blacklist sub-property of sanitize 

All uses of this property have been migrated to 'blocklist' instead.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: TH
Change-Id: I4b83b41ad5a4b2caf1166b1acece9537f545aaad
parent 222de6f1

cc/sanitize.go

+0 −8
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ type SanitizeProperties struct { 
		// value to pass to -fsanitize-recover=

		Recover []string



		// value to pass to -fsanitize-blacklist

		Blacklist *string

		// value to pass to -fsanitize-blacklist

		Blocklist *string

	} `android:"arch_variant"`
@@ -592,12 +590,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
			strings.Join(sanitize.Properties.Sanitize.Diag.No_recover, ","))

	}



	blacklist := android.OptionalPathForModuleSrc(ctx, sanitize.Properties.Sanitize.Blacklist)

	if blacklist.Valid() {

		flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blacklist.String())

		flags.CFlagsDeps = append(flags.CFlagsDeps, blacklist.Path())

	}



	blocklist := android.OptionalPathForModuleSrc(ctx, sanitize.Properties.Sanitize.Blocklist)

	if blocklist.Valid() {

		flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blocklist.String())