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

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

Issue 18722: Revert r8560 due to broken interactive_ui_tests (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 11 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/browser/browser.scons ('k') | chrome/common/process_watcher.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) 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 # TODO(port): Port these. 211 # TODO(port): Port these.
212 input_files.Remove( 212 input_files.Remove(
213 'chrome_plugin_lib.cc', 213 'chrome_plugin_lib.cc',
214 'chrome_plugin_util.cc', 214 'chrome_plugin_util.cc',
215 'chrome_process_filter.cc', 215 'chrome_process_filter.cc',
216 'drag_drop_types.cc', 216 'drag_drop_types.cc',
217 'gfx/emf.cc', 217 'gfx/emf.cc',
218 'gfx/icon_util.cc', 218 'gfx/icon_util.cc',
219 'gfx/path.cc', 219 'gfx/path.cc',
220 'ipc_logging.cc', 220 'ipc_logging.cc',
221 'jstemplate_builder.cc',
221 'os_exchange_data.cc', 222 'os_exchange_data.cc',
222 'plugin_messages.cc', 223 'plugin_messages.cc',
224 'process_watcher.cc',
225 'security_filter_peer.cc',
226 'win_safe_util.cc',
227 'win_util.cc',
223 ) 228 )
224 229
225 if not env.Bit('windows'): 230 if not env.Bit('windows'):
226 # Windows specific files 231 # Windows specific files
227 input_files.Remove( 232 input_files.Remove(
228 'classfactory.cc', 233 'classfactory.cc',
229 'gfx/chrome_canvas_win.cc', 234 'gfx/chrome_canvas_win.cc',
230 'gfx/chrome_font_win.cc', 235 'gfx/chrome_font_win.cc',
231 'ipc_channel_win.cc', 236 'ipc_channel_win.cc',
232 'resource_bundle_win.cc', 237 'resource_bundle_win.cc',
233 'win_safe_util.cc',
234 'win_util.cc',
235 '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', 238 '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
236 ) 239 )
237 240
238 if not env.Bit('linux'): 241 if not env.Bit('linux'):
239 # Linux specific files 242 # Linux specific files
240 input_files.Remove( 243 input_files.Remove(
241 'gfx/chrome_canvas_skia.cc', 244 'gfx/chrome_canvas_skia.cc',
242 'gfx/chrome_font_gtk.cc', 245 'gfx/chrome_font_gtk.cc',
243 'gfx/chrome_font_skia.cc', 246 'gfx/chrome_font_skia.cc',
244 ) 247 )
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 './common.vsprops', 300 './common.vsprops',
298 '$(SolutionDir)../build/release.vsprops', 301 '$(SolutionDir)../build/release.vsprops',
299 ]) 302 ])
300 303
301 p.AddFileConfig('../tools/build/win/precompiled.cc', 304 p.AddFileConfig('../tools/build/win/precompiled.cc',
302 'Debug|Win32', 305 'Debug|Win32',
303 tools=[ 306 tools=[
304 MSVSTool('VCCLCompilerTool', 307 MSVSTool('VCCLCompilerTool',
305 UsePrecompiledHeader='1'), 308 UsePrecompiledHeader='1'),
306 ]) 309 ])
OLDNEW
« no previous file with comments | « chrome/browser/browser.scons ('k') | chrome/common/process_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698