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

This commit is contained in:
Pirama Arumuga Nainar 2020-08-11 21:24:16 +00:00 committed by Gerrit Code Review
commit 84ce8d8d89

View file

@ -173,8 +173,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"`
@ -610,12 +608,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())