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

Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547

Change-Id: Ifc5522d987343999685c211c8951bca9d53f48fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-26 03:17:10 +00:00
committed by Automerger Merge Worker
parent 3f2880d220 cdd053d96e
commit a7ae4a45af
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/vendor_snapshot.go
View File

@@ -98,6 +98,11 @@ func isSnapshotAware(cfg android.DeviceConfig, m LinkableInterface, inProprietar
if !sanitizable.Shared() && sanitizable.IsSanitizerEnabled(scs) {
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.
// This is because cfi static libraries can't be linked from non-cfi modules,
// and vice versa.