Skip snapshot for sanitizer variants with both cfi and hwasan
cfi and hwasan cannot be enabled at the same time. Skip building vendor snasphots for the snapshot variants with both cfi and hwasan. Bug: 277174974 Bug: 290779821 Test: HWASAN_INCLUDE_PATHS=frameworks/native/libs/gui m Change-Id: Iaae913367a70e150d77a614de5f942aea98d1086
This commit is contained in:
parent
40c7bae1df
commit
a05a4f6f87
1 changed files with 5 additions and 0 deletions
|
@ -98,6 +98,11 @@ func isSnapshotAware(cfg android.DeviceConfig, m LinkableInterface, inProprietar
|
||||||
if !sanitizable.Shared() && sanitizable.IsSanitizerEnabled(scs) {
|
if !sanitizable.Shared() && sanitizable.IsSanitizerEnabled(scs) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
// cfi and hwasan cannot be enabled at the same time.
|
||||||
|
// Skip variants that have both cfi and hwasan enabled.
|
||||||
|
if sanitizable.IsSanitizerEnabled(cfi) && sanitizable.IsSanitizerEnabled(Hwasan) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
// cfi and hwasan also export both variants. But for static, we capture both.
|
// cfi and hwasan also export both variants. But for static, we capture both.
|
||||||
// This is because cfi static libraries can't be linked from non-cfi modules,
|
// This is because cfi static libraries can't be linked from non-cfi modules,
|
||||||
// and vice versa.
|
// and vice versa.
|
||||||
|
|
Loading…
Reference in a new issue