Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5a1bbff authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main

parents 534e2e50 a05a4f6f

cc/vendor_snapshot.go

+5 −0
Original line number Diff line number Diff line
@@ -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.