commit 3f9cc1e5f49a82dc2d53b4cabe3062ee18236782
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 04 20:33:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 04 20:33:29 2019 +0000
tree 7b429d4d9b434d9b3919f282c6e072a0b0d77d66
parent c51bf3993b299dcd5d48fca6626065609942f093
parent 5838f0ea12865ef0f9ddd1ccd8061752e48c5620

Merge "Make HeapprofdEndToEnd a parametrized test."

Android.bp

diff --git a/Android.bp b/Android.bp
index b061677..fbf1113 100644
--- a/Android.bp
+++ b/Android.bp
@@ -218,20 +218,6 @@
   ],
 }
 
-// GN target: //:idle_alloc
-cc_binary {
-  name: "idle_alloc",
-  srcs: [
-    "tools/idle_alloc.cc",
-  ],
-  shared_libs: [
-    "liblog",
-  ],
-  defaults: [
-    "perfetto_defaults",
-  ],
-}
-
 // GN target: //:libperfetto
 cc_library_shared {
   name: "libperfetto",
@@ -486,6 +472,7 @@
     "src/tracing/core/trace_stats.cc",
     "src/tracing/core/trace_writer_impl.cc",
     "src/tracing/core/tracing_service_impl.cc",
+    "src/tracing/core/tracing_service_state.cc",
     "src/tracing/core/virtual_destructors.cc",
     "src/tracing/data_source.cc",
     "src/tracing/internal/in_process_tracing_backend.cc",

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e28ab12..89c95be 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -378,8 +378,10 @@
   }
 }
 
-executable("idle_alloc") {
-  sources = [
-    "tools/idle_alloc.cc",
-  ]
+if (perfetto_build_standalone) {
+  executable("idle_alloc") {
+    sources = [
+      "tools/idle_alloc.cc",
+    ]
+  }
 }

tools/gen_android_bp

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 45b7ff3..fb6f5ee 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -48,7 +48,6 @@
     '//:heapprofd_client',
     '//:heapprofd',
     '//:trigger_perfetto',
-    '//:idle_alloc',
 ]
 
 # Defines a custom init_rc argument to be applied to the corresponding output