summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
authorscheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:04:13 +0000
committerscheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:04:13 +0000
commit820d851f56e3712a2f9ac7db545601d1b0355718 (patch)
tree18f4af5173da3f78086b409fa4ae9ceefb3f9f71 /base/base.gypi
parent91c3c300069d27c6ec8749636fec1c4c9018b29f (diff)
downloadchromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.zip
chromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.tar.gz
chromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.tar.bz2
Merge gpu_trace_event back into base/debug/trace_event.
Initial land attempt at http://codereview.chromium.org/6551019/ gpu_trace_event fork at http://codereview.chromium.org/6691013 - gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug - Unit Tests implemented for trace_event - gpu_common library removed (was added only for gpu_trace_event) - Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019) - GPU trace calls renamed to new calls. - Tracing switch removed from test_shell, as linux log file support removed. BUG=79509 TEST=trace_event_win_unittest and about:gpu Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284 Review URL: http://codereview.chromium.org/6862002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 51f50ed..578e50d 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -404,7 +404,6 @@
# regression to page cycler moz.
'sha1_win.cc',
'string16.cc',
- 'debug/trace_event.cc',
],
},],
['OS=="freebsd" or OS=="openbsd"', {