commit b1e90d29ac22cf9c33662bf11a8b63b7f8f5d37a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 11 04:45:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 11 04:45:24 2018 +0000
tree fe53eda50073fa80666ba3fb5a0b0d9d656d8882
parent 39ee5a4b47d1520e34cf91acf3bb37fb0eaab106
parent 1b0f2b49d528c90842b4263269d9039d7e07415e

Merge "Remove obsolete workaround."

linker/linker_libcxx_support.cpp

diff --git a/linker/linker_libcxx_support.cpp b/linker/linker_libcxx_support.cpp
index 41ed8bc..3d15b33 100644
--- a/linker/linker_libcxx_support.cpp
+++ b/linker/linker_libcxx_support.cpp
@@ -35,3 +35,7 @@
 extern "C" int __cxa_type_match() {
   async_safe_fatal("__cxa_type_match is not implemented in the linker");
 }
+
+int posix_memalign(void**, size_t, size_t) {
+  async_safe_fatal("posix_memalign is not implemented in the linker");
+}

tools/versioner/src/Android.bp

diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index 9151646..4b237a9 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -35,6 +35,8 @@
 
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_LIMIT_MACROS",
+
+        "-D_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS",
     ],
 
     target: {