summaryrefslogtreecommitdiffstats
path: root/buildcmds/Android.mk
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-08-07 21:36:32 -0700
committerDan Albert <danalbert@google.com>2015-08-07 21:40:47 -0700
commit1f3befa2de838d391427d5c1ef8e122eda355993 (patch)
tree9ed6e924fdba68b12ed7f1fb1e6297a8263c517b /buildcmds/Android.mk
parent2ea633775bea94317c426da71f3782ce322389fd (diff)
downloadexternal_libcxx-1f3befa2de838d391427d5c1ef8e122eda355993.tar.gz
external_libcxx-1f3befa2de838d391427d5c1ef8e122eda355993.tar.bz2
external_libcxx-1f3befa2de838d391427d5c1ef8e122eda355993.zip
Build and test with C++14.android-m-preview-2
Enable sized deallocation (disabled by clang by the default) so those tests pass. Bug: http://b/23043421 Change-Id: I347fa9a5653eb1ed0102d42234ba2de41616de39
Diffstat (limited to 'buildcmds/Android.mk')
-rw-r--r--buildcmds/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildcmds/Android.mk b/buildcmds/Android.mk
index 784924417..33d01ef0c 100644
--- a/buildcmds/Android.mk
+++ b/buildcmds/Android.mk
@@ -25,7 +25,8 @@ LOCAL_SRC_FILES := dummy.cpp
LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../test/support
LOCAL_CPPFLAGS := \
- -std=c++11 \
+ -std=c++14 \
+ -fsized-deallocation \
-fexceptions \
-UNDEBUG \
-w \