diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-26 22:04:08 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-26 22:04:08 +0000 |
| commit | 6b81740e988efd86522e4f19ceb5c2c239fb445a (patch) | |
| tree | a382c83d82de4d2910b809831528bd93d386938a | |
| parent | a46f65fac6339c4e48cff2290b52be47a425946c (diff) | |
| parent | c540d4ff67a08339430d651e6d0f7ca60dd995e5 (diff) | |
Snap for 11009879 from c540d4ff67a08339430d651e6d0f7ca60dd995e5 to u-keystone-qcom-release
Change-Id: I8d701c0bee1f8f8196685392f64ba7a12e82d04a
| -rw-r--r-- | cc/vendor_snapshot.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go index 6a49a3270..8580cf90d 100644 --- a/cc/vendor_snapshot.go +++ b/cc/vendor_snapshot.go @@ -100,6 +100,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. |