diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -765,9 +765,9 @@
   set(COMPILER_RT_HAS_CFI FALSE)
 endif()
 
-#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)
+if (SCUDO_STANDALONE_SUPPORTED_ARCH AND (
+      (OS_NAME MATCHES "Fuchsia") OR
+      (OS_NAME MATCHES "Linux|Android" AND COMPILER_RT_HAS_AUXV)))
   set(COMPILER_RT_HAS_SCUDO_STANDALONE TRUE)
 else()
   set(COMPILER_RT_HAS_SCUDO_STANDALONE FALSE)