StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Pirama Arumuga Nainar
2020-07-30 21:54:30 -07:00
parent 222de6f13b
commit c02c98b8f5
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/sanitize.go
View File

@@ -172,8 +172,6 @@ type SanitizeProperties struct {
// value to pass to -fsanitize-recover= // value to pass to -fsanitize-recover=
Recover []string Recover []string
// value to pass to -fsanitize-blacklist
Blacklist *string
// value to pass to -fsanitize-blacklist // value to pass to -fsanitize-blacklist
Blocklist *string Blocklist *string
} `android:"arch_variant"` } `android:"arch_variant"`
@@ -592,12 +590,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
strings.Join(sanitize.Properties.Sanitize.Diag.No_recover, ",")) 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) blocklist := android.OptionalPathForModuleSrc(ctx, sanitize.Properties.Sanitize.Blocklist)
if blocklist.Valid() { if blocklist.Valid() {
flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blocklist.String()) flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blocklist.String())