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

Side by Side Diff: chrome/common/common.scons

Issue 21039: Revert my change to get the tree green. Not sure why the tests became flaky.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.xcodeproj/project.pbxproj ('k') | chrome/common/common.vcproj » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 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 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.SConscript([ 9 env.SConscript([
10 '$BREAKPAD_DIR/using_breakpad.scons', 10 '$BREAKPAD_DIR/using_breakpad.scons',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'ipc_logging.h', 87 'ipc_logging.h',
88 'ipc_message.cc', 88 'ipc_message.cc',
89 'ipc_message.h', 89 'ipc_message.h',
90 'ipc_message_macros.h', 90 'ipc_message_macros.h',
91 'ipc_message_utils.cc', 91 'ipc_message_utils.cc',
92 'ipc_message_utils.h', 92 'ipc_message_utils.h',
93 'ipc_sync_channel.cc', 93 'ipc_sync_channel.cc',
94 'ipc_sync_channel.h', 94 'ipc_sync_channel.h',
95 'ipc_sync_message.cc', 95 'ipc_sync_message.cc',
96 'ipc_sync_message.h', 96 'ipc_sync_message.h',
97 'plugin_messages.cc',
97 'plugin_messages.h', 98 'plugin_messages.h',
98 'plugin_messages_internal.h', 99 'plugin_messages_internal.h',
100 'render_messages.cc',
99 'render_messages.h', 101 'render_messages.h',
100 'render_messages_internal.h', 102 'render_messages_internal.h',
101 ]), 103 ]),
102 'animation.cc', 104 'animation.cc',
103 'animation.h', 105 'animation.h',
104 'child_process.cc', 106 'child_process.cc',
105 'child_process.h', 107 'child_process.h',
106 'chrome_constants.cc', 108 'chrome_constants.cc',
107 'chrome_constants.h', 109 'chrome_constants.h',
108 'chrome_counters.cc', 110 'chrome_counters.cc',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 # TODO(port): Port these. 222 # TODO(port): Port these.
221 input_files.Remove( 223 input_files.Remove(
222 'chrome_plugin_util.cc', 224 'chrome_plugin_util.cc',
223 'chrome_process_filter.cc', 225 'chrome_process_filter.cc',
224 'drag_drop_types.cc', 226 'drag_drop_types.cc',
225 'gfx/emf.cc', 227 'gfx/emf.cc',
226 'gfx/icon_util.cc', 228 'gfx/icon_util.cc',
227 'gfx/path.cc', 229 'gfx/path.cc',
228 'ipc_logging.cc', 230 'ipc_logging.cc',
229 'os_exchange_data.cc', 231 'os_exchange_data.cc',
232 'plugin_messages.cc',
230 'process_watcher.cc', 233 'process_watcher.cc',
231 ) 234 )
232 235
233 if not env.Bit('windows'): 236 if not env.Bit('windows'):
234 # Windows specific files 237 # Windows specific files
235 input_files.Remove( 238 input_files.Remove(
236 'chrome_paths_win.cc', 239 'chrome_paths_win.cc',
237 'classfactory.cc', 240 'classfactory.cc',
238 'gfx/chrome_canvas_win.cc', 241 'gfx/chrome_canvas_win.cc',
239 'gfx/chrome_font_win.cc', 242 'gfx/chrome_font_win.cc',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 './common.vsprops', 316 './common.vsprops',
314 '$(SolutionDir)../build/release.vsprops', 317 '$(SolutionDir)../build/release.vsprops',
315 ]) 318 ])
316 319
317 p.AddFileConfig('../tools/build/win/precompiled.cc', 320 p.AddFileConfig('../tools/build/win/precompiled.cc',
318 'Debug|Win32', 321 'Debug|Win32',
319 tools=[ 322 tools=[
320 MSVSTool('VCCLCompilerTool', 323 MSVSTool('VCCLCompilerTool',
321 UsePrecompiledHeader='1'), 324 UsePrecompiledHeader='1'),
322 ]) 325 ])
OLDNEW
« no previous file with comments | « chrome/chrome.xcodeproj/project.pbxproj ('k') | chrome/common/common.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698