commit 14420d1a408d6185a05f58be30696d57ab5d7ee0
author Dan Albert <danalbert@google.com> Fri Feb 09 18:54:40 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 09 18:54:40 2018 +0000
tree 0f4bb95d9aba4a754c4b64e357f4045a538664da
parent 55781f8cd8e29672fb1fd939d27e72c59d6527aa
parent f272375120f3a416edf72bb3f8ffd43b8c237d68

Adapt to upstream changes. am: 2eddfdfc54 am: 18fda00ac0
am: f272375120

Change-Id: I42565cf0cddb4dba9e9e5db32c4071fcbfa46361

Android.bp

diff --git a/Android.bp b/Android.bp
index 5a06d8c..167f6b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,7 +27,6 @@
         "src/cxa_exception_storage.cpp",
         "src/cxa_guard.cpp",
         "src/cxa_handlers.cpp",
-        "src/cxa_new_delete.cpp",
         "src/cxa_personality.cpp",
         "src/cxa_thread_atexit.cpp",
         "src/cxa_unexpected.cpp",
@@ -36,6 +35,7 @@
         "src/fallback_malloc.cpp",
         "src/private_typeinfo.cpp",
         "src/stdlib_exception.cpp",
+        "src/stdlib_new_delete.cpp",
         "src/stdlib_stdexcept.cpp",
         "src/stdlib_typeinfo.cpp",
     ],