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

Side by Side Diff: chrome/chrome.gyp

Issue 232001: Resubmitting fix for 22174 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « DEPS ('k') | chrome/test/ui/ui_layout_test.h » ('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) 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 8
9 # Define the common dependencies that contain all the actual 9 # Define the common dependencies that contain all the actual
10 # Chromium functionality. This list gets pulled in below by 10 # Chromium functionality. This list gets pulled in below by
(...skipping 3923 matching lines...) Expand 10 before | Expand all | Expand 10 after
3934 'sources!': [ 3934 'sources!': [
3935 'browser/process_singleton_linux_uitest.cc', 3935 'browser/process_singleton_linux_uitest.cc',
3936 ], 3936 ],
3937 }], 3937 }],
3938 ['OS=="linux" and toolkit_views==1', { 3938 ['OS=="linux" and toolkit_views==1', {
3939 'dependencies': [ 3939 'dependencies': [
3940 '../views/views.gyp:views', 3940 '../views/views.gyp:views',
3941 ], 3941 ],
3942 }], 3942 }],
3943 ['OS=="mac"', { 3943 ['OS=="mac"', {
3944 'sources': [
3945 'app/keystone_glue.h',
3946 'app/keystone_glue.m',
3947 ],
3944 'sources!': [ 3948 'sources!': [
3945 # TODO(port) 3949 # TODO(port)
3946 'app/chrome_main_uitest.cc', 3950 'app/chrome_main_uitest.cc',
3947 'browser/login_prompt_uitest.cc', 3951 'browser/login_prompt_uitest.cc',
3948 'browser/metrics/metrics_service_uitest.cc', 3952 'browser/metrics/metrics_service_uitest.cc',
3949 # leaves an extra window on screen after test completes. 3953 # leaves an extra window on screen after test completes.
3950 'browser/sessions/session_restore_uitest.cc', 3954 'browser/sessions/session_restore_uitest.cc',
3951 # puts up modal dialogs. 3955 # puts up modal dialogs.
3952 'browser/unload_uitest.cc', 3956 'browser/unload_uitest.cc',
3953 'test/reliability/page_load_test.cc', 3957 'test/reliability/page_load_test.cc',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
3986 }, { # else: OS != "win" 3990 }, { # else: OS != "win"
3987 'sources!': [ 3991 'sources!': [
3988 # TODO(port)? (Most of these include windows.h or similar.) 3992 # TODO(port)? (Most of these include windows.h or similar.)
3989 'browser/extensions/extension_uitest.cc', 3993 'browser/extensions/extension_uitest.cc',
3990 'browser/media_uitest.cc', 3994 'browser/media_uitest.cc',
3991 'browser/printing/printing_layout_uitest.cc', 3995 'browser/printing/printing_layout_uitest.cc',
3992 'browser/views/find_bar_host_uitest.cc', 3996 'browser/views/find_bar_host_uitest.cc',
3993 'common/logging_chrome_uitest.cc', 3997 'common/logging_chrome_uitest.cc',
3994 'test/ui/npapi_uitest.cc', 3998 'test/ui/npapi_uitest.cc',
3995 'test/ui/sandbox_uitests.cc', 3999 'test/ui/sandbox_uitests.cc',
3996 'worker/worker_uitest.cc',
3997 ], 4000 ],
3998 }], 4001 }],
3999 ], 4002 ],
4000 }, 4003 },
4001 { 4004 {
4002 'target_name': 'unit_tests', 4005 'target_name': 'unit_tests',
4003 'type': 'executable', 4006 'type': 'executable',
4004 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC', 4007 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
4005 'dependencies': [ 4008 'dependencies': [
4006 'chrome', 4009 'chrome',
(...skipping 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
6655 'defines': [ 6658 'defines': [
6656 'POSIX', 6659 'POSIX',
6657 ], 6660 ],
6658 }], 6661 }],
6659 ], 6662 ],
6660 }, 6663 },
6661 ], # targets when chrome_personalization==1 and use_syncapi_stub==0 6664 ], # targets when chrome_personalization==1 and use_syncapi_stub==0
6662 }], 6665 }],
6663 ], # 'conditions' 6666 ], # 'conditions'
6664 } 6667 }
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome/test/ui/ui_layout_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698