diff --git a/Android.mk b/Android.mk
index 69144531e..87c0aa311 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,6 +65,7 @@ LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES)
 LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
 LOCAL_RTTI_FLAG := -frtti
 LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi libcompiler_rt
+LOCAL_CXX_STL := none
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_LIBRARY)
 
@@ -74,7 +75,7 @@ LOCAL_MODULE := libc++
 LOCAL_CLANG := true
 LOCAL_WHOLE_STATIC_LIBRARIES := libc++
 LOCAL_SHARED_LIBRARIES := libdl
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm
+LOCAL_CXX_STL := none
 
 ifneq ($(TARGET_ARCH),arm)
 	LOCAL_SHARED_LIBRARIES += libdl
@@ -93,6 +94,7 @@ LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
 LOCAL_RTTI_FLAG := -frtti
 LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi
 LOCAL_MULTILIB := both
+LOCAL_CXX_STL := none
 
 ifneq ($(HOST_OS), darwin)
 LOCAL_WHOLE_STATIC_LIBRARIES += libcompiler_rt
@@ -109,6 +111,7 @@ LOCAL_LDFLAGS := -nodefaultlibs
 LOCAL_LDLIBS := -lc
 LOCAL_WHOLE_STATIC_LIBRARIES := libc++
 LOCAL_MULTILIB := both
+LOCAL_CXX_STL := none
 
 ifeq ($(HOST_OS), darwin)
 LOCAL_LDFLAGS += \
diff --git a/libcxx.mk b/libcxx.mk
index a3258656a..d43e08160 100644
--- a/libcxx.mk
+++ b/libcxx.mk
@@ -14,14 +14,6 @@
 # limitations under the License.
 #
 
-# To use libc++, "include external/libcxx/libcxx.mk" in your target.
-
-LOCAL_C_INCLUDES := \
-	external/libcxx/include \
-	$(LOCAL_C_INCLUDES) \
-
-LOCAL_CFLAGS += -D_USING_LIBCXX
-LOCAL_CPPFLAGS += -nostdinc++
-LOCAL_LDFLAGS += -nodefaultlibs
-LOCAL_LDLIBS += -lm -lc
-LOCAL_SHARED_LIBRARIES += libc++
+# New projects shouldn't use this file. To use libc++, add the following line to
+# your makefile.
+LOCAL_CXX_STL := libc++