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

This reverts commit 2fe987e6ba.

Broke the Android buildbots. Turns out a couple more tweaks are
necessary to turn them back on.
This commit is contained in:
Mitch Phillips 2021-05-26 16:51:43 -07:00
parent b5c3f17e70
commit 2dba40561a

View file

@ -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)