From 80dd70d285ffe562f458d02dadb4c006885b0489 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 12 Nov 2018 12:03:04 -0800 Subject: [PATCH] adb: make benchmarks build on the host. Test: adb_benchmark Change-Id: I9afedd7bdcf645652e514d98bb88036753718168 --- adb/Android.bp | 4 ++++ adb/transport_benchmark.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/adb/Android.bp b/adb/Android.bp index 00e98feeb..ba72d9960 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -213,6 +213,7 @@ cc_test_host { cc_benchmark { name: "adb_benchmark", defaults: ["adb_defaults"], + host_supported: true, srcs: ["transport_benchmark.cpp"], target: { @@ -226,6 +227,9 @@ cc_benchmark { "libadb_host", ], }, + darwin: { + enabled: false, + } }, static_libs: [ diff --git a/adb/transport_benchmark.cpp b/adb/transport_benchmark.cpp index 022808f29..044c8ac1f 100644 --- a/adb/transport_benchmark.cpp +++ b/adb/transport_benchmark.cpp @@ -183,8 +183,10 @@ 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);