Merge "Fix the make_standalone_toolchain stdlib fix."
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake
index c1fb804..f568453 100644
--- a/build/cmake/android.toolchain.cmake
+++ b/build/cmake/android.toolchain.cmake
@@ -410,7 +410,7 @@
set(CMAKE_C_COMPILER_VERSION 8.0)
set(CMAKE_CXX_COMPILER_VERSION 8.0)
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT 11)
-set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT 98)
+set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT 14)
set(CMAKE_C_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
set(CMAKE_CXX_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
set(CMAKE_ASM_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
@@ -466,7 +466,6 @@
# STL specific flags.
if(ANDROID_STL MATCHES "^c\\+\\+_")
- list(APPEND ANDROID_COMPILER_FLAGS_CXX "-std=c++11")
if(ANDROID_ABI MATCHES "^armeabi")
list(APPEND ANDROID_LINKER_FLAGS "-Wl,--exclude-libs,libunwind.a")
endif()
diff --git a/docs/changelogs/Changelog-r19.md b/docs/changelogs/Changelog-r19.md
index 98c754e..d4a5e2e 100644
--- a/docs/changelogs/Changelog-r19.md
+++ b/docs/changelogs/Changelog-r19.md
@@ -54,6 +54,7 @@
-------
* Updated Clang to r339409.
+ * C++ compilation now defaults to C++14.
* [Issue 780]: A complete NDK toolchain is now installed to the Clang
directory. See the announcements section for more information.
* ndk-build no longer removes artifacts from `NDK_LIBS_OUT` for ABIs not
