[compiler-rt] 2dba405 - Revert "[scudo] Build scudo_standalone on Android and Fuchsia."

[Mitch Phillips via llvm-commits]

Author: Mitch Phillips
Date: 2021-05-26T16:52:13-07:00
New Revision: 2dba40561a28c56b8e96149642ca3cad3b3c4178

URL: https://github.com/llvm/llvm-project/commit/2dba40561a28c56b8e96149642ca3cad3b3c4178
DIFF: https://github.com/llvm/llvm-project/commit/2dba40561a28c56b8e96149642ca3cad3b3c4178.diff

LOG: Revert "[scudo] Build scudo_standalone on Android and Fuchsia."

This reverts commit 2fe987e6bacea8884a397041c13a38e8ba97c2d6.

Broke the Android buildbots. Turns out a couple more tweaks are
necessary to turn them back on.

Added: 
    

Modified: 
    compiler-rt/cmake/config-ix.cmake

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index dced7d383bcc..39e0a4b662c7 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -765,9 +765,9 @@ else()
   set(COMPILER_RT_HAS_CFI FALSE)
 endif()
 
-if (SCUDO_STANDALONE_SUPPORTED_ARCH AND (
-      (OS_NAME MATCHES "Fuchsia") OR
-      (OS_NAME MATCHES "Linux|Android" AND COMPILER_RT_HAS_AUXV)))
+#TODO(kostyak): add back Android & Fuchsia when the code settles a bit.
+if (SCUDO_STANDALONE_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux" AND
+    COMPILER_RT_HAS_AUXV)
   set(COMPILER_RT_HAS_SCUDO_STANDALONE TRUE)
 else()
   set(COMPILER_RT_HAS_SCUDO_STANDALONE FALSE)