commit 1fb86241ec5419ffb93daf436b857d47f1d33dd8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 14 06:57:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 14 06:57:46 2018 +0000
tree ab64da0d1ed9ebedfd815c88f401475603d564b7
parent 14818a8841ee5f9c0ad1681dc2483280ebef2df6
parent d51339b12eaaf16422339709565289f8300121bc

Merge "liblp: SparseBuilder: num_blocks aren't check correctly"

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index ba72d99..00e98fe 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -213,7 +213,6 @@
 cc_benchmark {
     name: "adb_benchmark",
     defaults: ["adb_defaults"],
-    host_supported: true,
 
     srcs: ["transport_benchmark.cpp"],
     target: {
@@ -227,9 +226,6 @@
                 "libadb_host",
             ],
         },
-        darwin: {
-            enabled: false,
-        }
     },
 
     static_libs: [

adb/transport_benchmark.cpp

diff --git a/adb/transport_benchmark.cpp b/adb/transport_benchmark.cpp
index 044c8ac..022808f 100644
--- a/adb/transport_benchmark.cpp
+++ b/adb/transport_benchmark.cpp
@@ -183,10 +183,8 @@
 ADB_CONNECTION_BENCHMARK(BM_Connection_Echo, ThreadPolicy::MainThread);
 
 int main(int argc, char** argv) {
-#if defined(__BIONIC__)
     // Set M_DECAY_TIME so that our allocations aren't immediately purged on free.
     mallopt(M_DECAY_TIME, 1);
-#endif
 
     android::base::SetMinimumLogSeverity(android::base::WARNING);
     adb_trace_init(argv);

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index 6b4901b..b6d6da1 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -536,8 +536,8 @@
         if (group_size >= group->maximum_size() ||
             group->maximum_size() - group_size < space_needed) {
             LERROR << "Partition " << partition->name() << " is part of group " << group->name()
-                   << " which does not have enough space free (" << space_needed << "requested, "
-                   << group_size << " used out of " << group->maximum_size();
+                   << " which does not have enough space free (" << space_needed << " requested, "
+                   << group_size << " used out of " << group->maximum_size() << ")";
             return false;
         }
     }