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

Merge "Allow sanitize attribute on cc_objects and propagate sanitize attributes into them." am: bcb5ca006c am: 714f705bc0

Browse Source 
am: d8ef18668d

Change-Id: I1c6f576213977d9971eeb282d6f71e553d75bde6
This commit is contained in:
Peter Collingbourne
2019-09-27 13:23:27 -07:00
committed by android-build-merger
parent 58cf7e32b7 d8ef18668d
commit 8f63bc37e2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/object.go
View File

@@ -52,8 +52,9 @@ type ObjectLinkerProperties struct {
// input to a cc_genrule module.
func ObjectFactory() android.Module {
module := newBaseModule(android.HostAndDeviceSupported, android.MultilibBoth)
module.sanitize = &sanitize{}
module.linker = &objectLinker{
baseLinker: NewBaseLinker(nil),
baseLinker: NewBaseLinker(module.sanitize),
}
module.compiler = NewBaseCompiler()

2
cc/sanitize.go
View File

@@ -674,7 +674,7 @@ func (sanitize *sanitize) isSanitizerEnabled(t sanitizerType) bool {
func isSanitizableDependencyTag(tag blueprint.DependencyTag) bool {
t, ok := tag.(dependencyTag)
return ok && t.library || t == reuseObjTag
return ok && t.library || t == reuseObjTag || t == objDepTag
}
// Propagate sanitizer requirements down from binaries