commit e4e3de819d05481422f8bb9925486118924bf4a1
author Dimitry Ivanov <dimitry@google.com> Wed Sep 26 09:03:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 09:03:45 2018 +0000
tree f24632f210a89a2963a4bb92677c81a5b29c08a5
parent fe108db540dec0e3299d7a389461177deee81dc5
parent b8b3a7660617962396e79ecb57768b6e97f0e420

Merge "linker: extract defaults and source files"

benchmarks/Android.bp

diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
index 842f7cb..bf8b10d 100644
--- a/benchmarks/Android.bp
+++ b/benchmarks/Android.bp
@@ -40,11 +40,13 @@
         "time_benchmark.cpp",
         "unistd_benchmark.cpp",
     ],
-    shared_libs: ["libtinyxml2"],
+    shared_libs: ["liblog"],
     static_libs: [
         "libbase",
         "libBionicBenchmarksUtils",
+        "libtinyxml2",
     ],
+    stl: "libc++_static",
 }
 
 cc_defaults {

linker/linked_list.h

diff --git a/linker/linked_list.h b/linker/linked_list.h
index 048ea4d..7f70a2c 100644
--- a/linker/linked_list.h
+++ b/linker/linked_list.h
@@ -84,7 +84,7 @@
     clear();
   }
 
-  LinkedList(LinkedList&& that) {
+  LinkedList(LinkedList&& that) noexcept {
     this->head_ = that.head_;
     this->tail_ = that.tail_;
     that.head_ = that.tail_ = nullptr;