Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/chrome_dll.gypi

Issue 1038453002: Add option to export tracing events to ETW. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed reviewer's comments. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/BUILD.gn ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 # up actual Chromium functionality into this .dll. 125 # up actual Chromium functionality into this .dll.
126 'chrome_version_resources', 126 'chrome_version_resources',
127 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', 127 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
128 '../content/app/resources/content_resources.gyp:content_resource s', 128 '../content/app/resources/content_resources.gyp:content_resource s',
129 '../crypto/crypto.gyp:crypto', 129 '../crypto/crypto.gyp:crypto',
130 '../net/net.gyp:net_resources', 130 '../net/net.gyp:net_resources',
131 '../ui/views/views.gyp:views', 131 '../ui/views/views.gyp:views',
132 ], 132 ],
133 'sources': [ 133 'sources': [
134 'app/chrome_dll.rc', 134 'app/chrome_dll.rc',
135
136 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ',
Nico 2015/03/31 22:26:08 huh, this looks wrong to me. I haven't seen <(SHAR
Georges Khalil 2015/04/01 16:47:04 The diff is misleading as this is actually an exis
135 137
136 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ', 138 # ETW Manifest.
139 '<(SHARED_INTERMEDIATE_DIR)/base/trace_event/etw_manifest/chrome _events_win.rc',
137 140
138 # Cursors. 141 # Cursors.
139 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c', 142 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c',
140 ], 143 ],
141 'include_dirs': [ 144 'include_dirs': [
142 '<(DEPTH)/third_party/wtl/include', 145 '<(DEPTH)/third_party/wtl/include',
143 ], 146 ],
144 'configurations': { 147 'configurations': {
145 'Debug_Base': { 148 'Debug_Base': {
146 'msvs_settings': { 149 'msvs_settings': {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 'dependencies': [ 371 'dependencies': [
369 '../pdf/pdf.gyp:pdf', 372 '../pdf/pdf.gyp:pdf',
370 ], 373 ],
371 }], 374 }],
372 ], 375 ],
373 }, # target chrome_child_dll 376 }, # target chrome_child_dll
374 ], 377 ],
375 }], 378 }],
376 ], 379 ],
377 } 380 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698