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

Merge "[cc/sanitize] Add Blocklist property"

Browse Source
This commit is contained in:
Pirama Arumuga Nainar
2020-07-28 17:21:59 +00:00
committed by Gerrit Code Review
parent 8ffde8c9d5 6c4ccca7b7
commit eda8499a3c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/sanitize.go
View File

@@ -174,6 +174,8 @@ type SanitizeProperties struct {
// value to pass to -fsanitize-blacklist // value to pass to -fsanitize-blacklist
Blacklist *string Blacklist *string
// value to pass to -fsanitize-blacklist
Blocklist *string
} `android:"arch_variant"` } `android:"arch_variant"`
SanitizerEnabled bool `blueprint:"mutated"` SanitizerEnabled bool `blueprint:"mutated"`
@@ -596,6 +598,12 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
flags.CFlagsDeps = append(flags.CFlagsDeps, blacklist.Path()) 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())
flags.CFlagsDeps = append(flags.CFlagsDeps, blocklist.Path())
}
return flags return flags
} }