diff options
| author | Dan Albert <danalbert@google.com> | 2018-02-09 18:54:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-09 18:54:34 +0000 |
| commit | 7ce32925f194ccc3df2b947b6901e6f1717bdbe2 (patch) | |
| tree | 866fec8c533aba5f6d0e03117ddfb094ed1938e6 | |
| parent | 3a461898644a5620ec10de4b8b31ae330e09b171 (diff) | |
| parent | 916ed50dec6bba0eaf6dfc4fb2641dc2929b7412 (diff) | |
| download | external_libcxx-7ce32925f194ccc3df2b947b6901e6f1717bdbe2.tar.gz external_libcxx-7ce32925f194ccc3df2b947b6901e6f1717bdbe2.tar.bz2 external_libcxx-7ce32925f194ccc3df2b947b6901e6f1717bdbe2.zip | |
Adapt to upstream changes. am: 80bd2e4b23 am: 48a3fead9e
am: 916ed50dec
Change-Id: Ifa1907af0ae872ff5c2147a2b039e15b62d23178
4 files changed, 10 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 737e284e7..4312e5bf8 100644 --- a/Android.bp +++ b/Android.bp @@ -48,10 +48,11 @@ cc_library_static { "src/utility.cpp", "src/valarray.cpp", "src/variant.cpp", + "src/vector.cpp", ], local_include_dirs: ["include"], export_include_dirs: ["include"], - cflags: ["-Wall", "-Werror"], + cflags: ["-Wall", "-Werror", "-Wno-unused-parameter"], cppflags: [ "-std=c++14", "-nostdinc++", diff --git a/buildcmds/Android.mk b/buildcmds/Android.mk index 363a4c1b5..70f170195 100644 --- a/buildcmds/Android.mk +++ b/buildcmds/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := dummy.cpp LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../test/support LOCAL_CPPFLAGS := \ - -std=c++1z \ + -std=c++17 \ -fsized-deallocation \ -fexceptions \ -UNDEBUG \ diff --git a/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp b/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp index e7bdd897c..96cdf29f1 100644 --- a/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp +++ b/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp @@ -16,6 +16,10 @@ // // REQUIRES: long_tests +// This test allocates 4GiB of 'a', which is not possible on a typical mobile +// device. +// UNSUPPORTED: android + #include <sstream> #include <cassert> #include "test_macros.h" diff --git a/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp b/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp index 52100c304..0964e0e49 100644 --- a/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp +++ b/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp @@ -9,6 +9,9 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: clang-3, clang-4, clang-5, apple-clang, gcc-4, gcc-5, gcc-6 +// +// AOSP's clang doesn't have __has_unique_object_representations yet. +// XFAIL: android // type_traits |