commit 84ce8d8d8963723145a0f45162ad1c4188a47fef
author Pirama Arumuga Nainar <pirama@google.com> Tue Aug 11 21:24:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 11 21:24:16 2020 +0000
tree 4145a4624f222b0525fc43c8e15715e464f390a5
parent 3d02e1f3c58e9693575aa2f70c806c252ed1ee48
parent c02c98b8f5598ffa8762d1d8271f97973bec1cdf

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

cc/sanitize.go

diff --git a/cc/sanitize.go b/cc/sanitize.go
index 6db6348..2243082 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -174,8 +174,6 @@
 		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 @@
 			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())