diff options
| author | erg <erg@chromium.org> | 2015-11-18 10:55:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 18:56:15 +0000 |
| commit | 4706d070db1dde84a3bd94ce73c4545949439fbe (patch) | |
| tree | 813ac54115c1ed36a74948e4bc48747e2e5e53c0 /mojo/mojo_base.gyp | |
| parent | 17ec244eb92d303b49b3f89eace52ac38d3698d5 (diff) | |
| download | chromium_src-4706d070db1dde84a3bd94ce73c4545949439fbe.zip chromium_src-4706d070db1dde84a3bd94ce73c4545949439fbe.tar.gz chromium_src-4706d070db1dde84a3bd94ce73c4545949439fbe.tar.bz2 | |
Revert of mandoline/mojo: Make ApplicaitonImpl connect to tracing during startup. (patchset #9 id:160001 of https://codereview.chromium.org/1440403002/ )
Reason for revert:
Breaks on android due to lifetime issues. This approach isn't going to work.
Original issue's description:
> 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
>
> Committed: https://crrev.com/64370e5eaf911e665b991361b0da1f9d5baa95b7
> Cr-Commit-Position: refs/heads/master@{#360174}
TBR=sky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=534895, 557467
Review URL: https://codereview.chromium.org/1462593002
Cr-Commit-Position: refs/heads/master@{#360377}
Diffstat (limited to 'mojo/mojo_base.gyp')
| -rw-r--r-- | mojo/mojo_base.gyp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index 9317698..9c308c6 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -241,14 +241,8 @@ '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', @@ -262,7 +256,6 @@ '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': [ |