Merge "Revert "adb: make benchmarks build on the host.""

LineageOS-OP2 · Nov 13, 2018 · a958fb6 · a958fb6
2 parents 3898f7d + 7898e85
commit a958fb6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/Android.bp b/Android.bp
@@ -213,7 +213,6 @@ cc_test_host {
 cc_benchmark {
     name: "adb_benchmark",
     defaults: ["adb_defaults"],
-    host_supported: true,
 
     srcs: ["transport_benchmark.cpp"],
     target: {
@@ -227,9 +226,6 @@ cc_benchmark {
                 "libadb_host",
             ],
         },
-        darwin: {
-            enabled: false,
-        }
     },
 
     static_libs: [

diff --git a/transport_benchmark.cpp b/transport_benchmark.cpp
@@ -183,10 +183,8 @@ ADB_CONNECTION_BENCHMARK(BM_Connection_Echo, ThreadPolicy::SameThread);
 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);