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

Side by Side Diff: chrome/chrome.gyp

Issue 131007: Linux: Enable metrics_service_uitest.cc. Take 2. (Closed)
Patch Set: Created 11 years, 6 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/zygote_main_linux.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 3182 matching lines...) Expand 10 before | Expand all | Expand 10 after
3193 ], 3193 ],
3194 'conditions': [ 3194 'conditions': [
3195 ['OS=="linux"', { 3195 ['OS=="linux"', {
3196 'dependencies': [ 3196 'dependencies': [
3197 '../build/linux/system.gyp:gtk', 3197 '../build/linux/system.gyp:gtk',
3198 ], 3198 ],
3199 'sources!': [ 3199 'sources!': [
3200 # TODO(port) 3200 # TODO(port)
3201 'browser/crash_recovery_uitest.cc', 3201 'browser/crash_recovery_uitest.cc',
3202 'browser/login_prompt_uitest.cc', 3202 'browser/login_prompt_uitest.cc',
3203 'browser/metrics/metrics_service_uitest.cc',
3204 'browser/renderer_host/resource_dispatcher_host_uitest.cc', 3203 'browser/renderer_host/resource_dispatcher_host_uitest.cc',
3205 'test/reliability/page_load_test.cc', 3204 'test/reliability/page_load_test.cc',
3206 'test/ui/layout_plugin_uitest.cc', 3205 'test/ui/layout_plugin_uitest.cc',
3207 ], 3206 ],
3208 }], 3207 }],
3209 ['OS=="linux" and toolkit_views==1', { 3208 ['OS=="linux" and toolkit_views==1', {
3210 'dependencies': [ 3209 'dependencies': [
3211 '../views/views.gyp:views', 3210 '../views/views.gyp:views',
3212 ], 3211 ],
3213 }], 3212 }],
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
4769 # Use outputs of this action as inputs for the main target build. 4768 # Use outputs of this action as inputs for the main target build.
4770 # Seems as a misnomer but makes this happy on Linux (scons). 4769 # Seems as a misnomer but makes this happy on Linux (scons).
4771 'process_outputs_as_sources': 1, 4770 'process_outputs_as_sources': 1,
4772 }, 4771 },
4773 ], # 'actions' 4772 ], # 'actions'
4774 }, 4773 },
4775 ] 4774 ]
4776 }], 4775 }],
4777 ], # 'conditions' 4776 ], # 'conditions'
4778 } 4777 }
OLDNEW
« no previous file with comments | « chrome/browser/zygote_main_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698