diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 03:47:37 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 03:47:37 +0000 |
commit | 300ac331975c67c2a71c548b1da8bc6623fa8896 (patch) | |
tree | 7fb93562b2e0da353e25f0b40df902446ca39056 /base/debug/trace_event_impl.cc | |
parent | db49d76770c77cd6a4273ef38304b6ea394cb281 (diff) | |
download | chromium_src-300ac331975c67c2a71c548b1da8bc6623fa8896.zip chromium_src-300ac331975c67c2a71c548b1da8bc6623fa8896.tar.gz chromium_src-300ac331975c67c2a71c548b1da8bc6623fa8896.tar.bz2 |
Create top-level separate targets for browser and child dlls
The general idea is that there's top level targets chrome and chrome_child,
and corresponding content_app and content_app_child that depend on only
the subtargets that should be included in the appropriate dll.
Pull bluetooth_utils from bluetooth_device into separate common target
as it's referenced from chrome/common/extensions.
Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
for gyp.
Links, but Blink is still included in browser.
Single-process mode is currently disabled when chrome_multiple_dll is set.
Current graph is at: http://commondatastorage.googleapis.com/chromelinkgraph/deps.html
generated by "python tools\win\split_link\graph_dependencies.py deps.html"
Remove the previous hacky-er attempt at this that was named "split dll".
TBR=jam@chromium.org
BUG=237249,256965
Review URL: https://codereview.chromium.org/17619005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug/trace_event_impl.cc')
-rw-r--r-- | base/debug/trace_event_impl.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index 4d637cd..e061ea1 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -42,11 +42,8 @@ class DeleteTraceLogForTesting { } }; -// Not supported in split-dll build. http://crbug.com/237249 -#if !defined(CHROME_SPLIT_DLL) // The thread buckets for the sampling profiler. BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state[3]; -#endif namespace base { namespace debug { @@ -981,8 +978,6 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter, category_filter_ = CategoryFilter(category_filter); EnableIncludedCategoryGroups(); - // Not supported in split-dll build. http://crbug.com/237249 - #if !defined(CHROME_SPLIT_DLL) if (options & ENABLE_SAMPLING) { sampling_thread_.reset(new TraceSamplingThread); sampling_thread_->RegisterSampleBucket( @@ -1002,7 +997,6 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter, DCHECK(false) << "failed to create thread"; } } - #endif dispatching_to_observer_list_ = true; observer_list = enabled_state_observer_list_; |