Switch back to SANITIZER_ANDROID

vitalybuka · web-flow · commit 8b6c0349b888 · 2024-06-13T17:02:05.000-07:00
diff --git a/compiler-rt/lib/hwasan/hwasan_linux.cpp b/compiler-rt/lib/hwasan/hwasan_linux.cpp
@@ -106,8 +106,7 @@ static uptr GetHighMemEnd() {
 }
 
 static void InitializeShadowBaseAddress(uptr shadow_size_bytes) {
-  if (SANITIZER_CAN_USE_PREINIT_ARRAY &&
-      flags()->fixed_shadow_base != (uptr)-1) {
+  if (!SANITIZER_ANDROID && flags()->fixed_shadow_base != (uptr)-1) {
     __hwasan_shadow_memory_dynamic_address = flags()->fixed_shadow_base;
   } else {
     __hwasan_shadow_memory_dynamic_address =

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ static uptr GetHighMemEnd() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`static void InitializeShadowBaseAddress(uptr shadow_size_bytes) {`
`109`		`- if (SANITIZER_CAN_USE_PREINIT_ARRAY &&`
`110`		`- flags()->fixed_shadow_base != (uptr)-1) {`
	`109`	`+ if (!SANITIZER_ANDROID && flags()->fixed_shadow_base != (uptr)-1) {`
`111`	`110`	`__hwasan_shadow_memory_dynamic_address = flags()->fixed_shadow_base;`
`112`	`111`	`} else {`
`113`	`112`	`__hwasan_shadow_memory_dynamic_address =`