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

Side by Side Diff: chrome/chrome.gyp

Issue 160436: It's a copy of http://codereview.chromium.org/155772, with the fix for valgri... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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/browser/process_singleton_win.cc ('k') | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 3565 matching lines...) Expand 10 before | Expand all | Expand 10 after
3576 'browser/errorpage_uitest.cc', 3576 'browser/errorpage_uitest.cc',
3577 'browser/extensions/extension_uitest.cc', 3577 'browser/extensions/extension_uitest.cc',
3578 'browser/history/redirect_uitest.cc', 3578 'browser/history/redirect_uitest.cc',
3579 'browser/iframe_uitest.cc', 3579 'browser/iframe_uitest.cc',
3580 'browser/images_uitest.cc', 3580 'browser/images_uitest.cc',
3581 'browser/locale_tests_uitest.cc', 3581 'browser/locale_tests_uitest.cc',
3582 'browser/login_prompt_uitest.cc', 3582 'browser/login_prompt_uitest.cc',
3583 'browser/media_uitest.cc', 3583 'browser/media_uitest.cc',
3584 'browser/metrics/metrics_service_uitest.cc', 3584 'browser/metrics/metrics_service_uitest.cc',
3585 'browser/printing/printing_layout_uitest.cc', 3585 'browser/printing/printing_layout_uitest.cc',
3586 'browser/process_singleton_linux_uitest.cc',
3586 'browser/renderer_host/resource_dispatcher_host_uitest.cc', 3587 'browser/renderer_host/resource_dispatcher_host_uitest.cc',
3587 'browser/sanity_uitest.cc', 3588 'browser/sanity_uitest.cc',
3588 'browser/session_history_uitest.cc', 3589 'browser/session_history_uitest.cc',
3589 'browser/sessions/session_restore_uitest.cc', 3590 'browser/sessions/session_restore_uitest.cc',
3590 'browser/tab_contents/view_source_uitest.cc', 3591 'browser/tab_contents/view_source_uitest.cc',
3591 'browser/tab_restore_uitest.cc', 3592 'browser/tab_restore_uitest.cc',
3592 'browser/unload_uitest.cc', 3593 'browser/unload_uitest.cc',
3593 'browser/views/find_bar_win_uitest.cc', 3594 'browser/views/find_bar_win_uitest.cc',
3594 'common/logging_chrome_uitest.cc', 3595 'common/logging_chrome_uitest.cc',
3595 'common/pref_service_uitest.cc', 3596 'common/pref_service_uitest.cc',
(...skipping 19 matching lines...) Expand all
3615 ['OS=="linux"', { 3616 ['OS=="linux"', {
3616 'dependencies': [ 3617 'dependencies': [
3617 '../build/linux/system.gyp:gtk', 3618 '../build/linux/system.gyp:gtk',
3618 ], 3619 ],
3619 'sources!': [ 3620 'sources!': [
3620 # TODO(port) 3621 # TODO(port)
3621 'browser/login_prompt_uitest.cc', 3622 'browser/login_prompt_uitest.cc',
3622 'test/reliability/page_load_test.cc', 3623 'test/reliability/page_load_test.cc',
3623 'test/ui/layout_plugin_uitest.cc', 3624 'test/ui/layout_plugin_uitest.cc',
3624 ], 3625 ],
3626 }, { # else: OS != "linux"
3627 'sources!': [
3628 'browser/process_singleton_linux_uitest.cc',
3629 ],
3625 }], 3630 }],
3626 ['OS=="linux" and toolkit_views==1', { 3631 ['OS=="linux" and toolkit_views==1', {
3627 'dependencies': [ 3632 'dependencies': [
3628 '../views/views.gyp:views', 3633 '../views/views.gyp:views',
3629 ], 3634 ],
3630 }], 3635 }],
3631 ['OS=="mac"', { 3636 ['OS=="mac"', {
3632 'sources!': [ 3637 'sources!': [
3633 # TODO(port) 3638 # TODO(port)
3634 'app/chrome_main_uitest.cc', 3639 'app/chrome_main_uitest.cc',
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
5223 # Use outputs of this action as inputs for the main target build. 5228 # Use outputs of this action as inputs for the main target build.
5224 # Seems as a misnomer but makes this happy on Linux (scons). 5229 # Seems as a misnomer but makes this happy on Linux (scons).
5225 'process_outputs_as_sources': 1, 5230 'process_outputs_as_sources': 1,
5226 }, 5231 },
5227 ], # 'actions' 5232 ], # 'actions'
5228 }, 5233 },
5229 ] 5234 ]
5230 }], 5235 }],
5231 ], # 'conditions' 5236 ], # 'conditions'
5232 } 5237 }
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698