diff --git a/libc/Android.mk b/libc/Android.mk
index 8ffaaf391..078e8c3ae 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1161,11 +1161,14 @@ LOCAL_CLANG := $(use_clang)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
 
 LOCAL_SHARED_LIBRARIES := libc libdl
-LOCAL_CXX_STL := none
-LOCAL_SYSTEM_SHARED_LIBRARIES :=
+ifeq ($(TARGET_ARCH),arm)
 # Only need this for arm since libc++ uses its own unwind code that
 # doesn't mix with the other default unwind code.
-LOCAL_STATIC_LIBRARIES_arm := libc++_static
+LOCAL_CXX_STL := libc++_static
+else
+LOCAL_CXX_STL := none
+endif
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 
 # Don't install on release build