summaryrefslogtreecommitdiffstats
path: root/libm
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-10-16 07:44:47 -0700
committerDan Albert <danalbert@google.com>2014-10-16 07:44:47 -0700
commite91d9cd4ad0916707e0717663694a5562bf11c78 (patch)
treec566ae076402b4d51a54ad1cf81093e2fccc33ca /libm
parent71cbcdcf947835076241b9dd72099f28997eb290 (diff)
downloadbionic-e91d9cd4ad0916707e0717663694a5562bf11c78.zip
bionic-e91d9cd4ad0916707e0717663694a5562bf11c78.tar.gz
bionic-e91d9cd4ad0916707e0717663694a5562bf11c78.tar.bz2
Don't use an STL for libm.
The default is none right now, but this will be needed when the default becomes libc++. Change-Id: Ib022adac2b9dc08fbfae830908128043cfffb91e
Diffstat (limited to 'libm')
-rw-r--r--libm/Android.mk3
1 files changed, 3 insertions, 0 deletions
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_SRC_FILES_mips := mips/fenv.c
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_WHOLE_STATIC_LIBRARIES := libm
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.