summaryrefslogtreecommitdiffstats
path: root/mojo/mojo_base.gyp
diff options
context:
space:
mode:
authorerg <erg@chromium.org>2015-11-17 14:04:28 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-17 22:05:11 +0000
commit64370e5eaf911e665b991361b0da1f9d5baa95b7 (patch)
tree8d38a8d651873745b205f7ca159e28082270a7af /mojo/mojo_base.gyp
parent9a55fac787ba88f4139c2db41ea87be669272246 (diff)
downloadchromium_src-64370e5eaf911e665b991361b0da1f9d5baa95b7.zip
chromium_src-64370e5eaf911e665b991361b0da1f9d5baa95b7.tar.gz
chromium_src-64370e5eaf911e665b991361b0da1f9d5baa95b7.tar.bz2
mandoline/mojo: Make ApplicaitonImpl connect to tracing during startup.
This removes explicit initialization of the tracing system from individual mojo apps and moves it to ApplicationImpl, which always runs. BUG=534895 Review URL: https://codereview.chromium.org/1440403002 Cr-Commit-Position: refs/heads/master@{#360174}
Diffstat (limited to 'mojo/mojo_base.gyp')
-rw-r--r--mojo/mojo_base.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 9c308c6..9317698 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -241,8 +241,14 @@
'application/public/cpp/lib/service_provider_impl.cc',
'application/public/cpp/lib/service_registry.cc',
'application/public/cpp/lib/service_registry.h',
+ 'application/public/cpp/lib/trace_provider_impl.cc',
+ 'application/public/cpp/lib/trace_provider_impl.h',
+ 'application/public/cpp/lib/tracing_impl.cc',
+ 'application/public/cpp/lib/tracing_impl.h',
'application/public/cpp/service_connector.h',
'application/public/cpp/service_provider_impl.h',
+ 'application/public/cpp/switches.cc',
+ 'application/public/cpp/switches.h',
],
'dependencies': [
'mojo_application_bindings',
@@ -256,6 +262,7 @@
'dependencies': [
'mojo_application_bindings_mojom',
'mojo_services.gyp:network_service_bindings_lib',
+ 'mojo_services.gyp:tracing_service_bindings_lib',
'../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
],
'export_dependent_settings': [