Revert "[soong] Add memtag-stack sanitizer, switch to linker-gen..."
Revert submission 2096883-memtag-stack
Reason for revert: b/244454542
Reverted Changes:
I7fee03d90:memtag_stack tests.
I52d2318c8:[soong] Add memtag-stack sanitizer, switch to link...
Change-Id: I3967151d98514fa07f66804aa8ff403df3962fa3
diff --git a/cc/sanitize_test.go b/cc/sanitize_test.go
index 48ac650..5d7e7d8 100644
--- a/cc/sanitize_test.go
+++ b/cc/sanitize_test.go
@@ -344,13 +344,19 @@
func checkHasMemtagNote(t *testing.T, m android.TestingModule, expected MemtagNoteType) {
t.Helper()
+ note_async := "note_memtag_heap_async"
+ note_sync := "note_memtag_heap_sync"
found := None
- ldFlags := m.Rule("ld").Args["ldFlags"]
- if strings.Contains(ldFlags, "-fsanitize-memtag-mode=async") {
- found = Async
- } else if strings.Contains(ldFlags, "-fsanitize-memtag-mode=sync") {
- found = Sync
+ implicits := m.Rule("ld").Implicits
+ for _, lib := range implicits {
+ if strings.Contains(lib.Rel(), note_async) {
+ found = Async
+ break
+ } else if strings.Contains(lib.Rel(), note_sync) {
+ found = Sync
+ break
+ }
}
if found != expected {