Adapt to upstream changes.

Test: mma
Test: ./run_tests.py --bitness 64
Bug: None
Change-Id: I2f181c661253dffad5325c92c5fd4c05e741850f

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++",

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 \

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"

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