commit 8bb12127e62c1fc4d9dc99ce9272008023c7c08e
author Dan Albert <danalbert@google.com> Thu Oct 16 15:56:31 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 16 15:56:32 2014 +0000
tree 01f6b027c71c48af55e8c82184706f1b4e93a054
parent f5e0258268b45faa4d84de34047660061720abc7
parent e91d9cd4ad0916707e0717663694a5562bf11c78

Merge "Don't use an STL for libm."

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 69a17a1..0f63d7b 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -295,6 +295,7 @@
 LOCAL_C_INCLUDES_mips64 := $(libm_ld_includes)
 LOCAL_SRC_FILES_mips64 := mips/fenv.c $(libm_ld_src_files)
 
+LOCAL_CXX_STL := none
 include $(BUILD_STATIC_LIBRARY)
 
 #
@@ -312,6 +313,8 @@
 
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 
+LOCAL_CXX_STL := none
+
 # We'd really like to do this for all architectures, but since this wasn't done
 # before, these symbols must continue to be exported on LP32 for binary
 # compatibility.