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

Side by Side Diff: chrome/chrome.gyp

Issue 21453003: Fix content_browsertests and other full stack tests in multiple_dll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | « android_webview/android_webview.gyp ('k') | chrome/chrome_dll.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
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
11 # Linux or Mac, and into chrome.dll on Windows. 11 # Linux or Mac, and into chrome.dll on Windows.
12 # NOTE: Most new includes should go in the OS!="ios" condition below. 12 # NOTE: Most new includes should go in the OS!="ios" condition below.
13 'chromium_browser_dependencies': [ 13 'chromium_browser_dependencies': [
14 'common', 14 'common',
15 'browser', 15 'browser',
16 '../content/content.gyp:content_app',
17 '../sync/sync.gyp:sync', 16 '../sync/sync.gyp:sync',
18 ], 17 ],
19 'chromium_child_dependencies': [ 18 'chromium_child_dependencies': [
20 'common', 19 'common',
21 '../sync/sync.gyp:sync', 20 '../sync/sync.gyp:sync',
22 ], 21 ],
23 'allocator_target': '../base/allocator/allocator.gyp:allocator', 22 'allocator_target': '../base/allocator/allocator.gyp:allocator',
24 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 23 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
25 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 24 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
26 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 25 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 ], # 'targets' 1193 ], # 'targets'
1195 'includes': [ 1194 'includes': [
1196 'chrome_android.gypi', 1195 'chrome_android.gypi',
1197 ]}, # 'includes' 1196 ]}, # 'includes'
1198 ], # OS=="android" 1197 ], # OS=="android"
1199 ['configuration_policy==1 and OS!="android"', { 1198 ['configuration_policy==1 and OS!="android"', {
1200 'includes': [ 'policy.gypi', ], 1199 'includes': [ 'policy.gypi', ],
1201 }], 1200 }],
1202 ], # 'conditions' 1201 ], # 'conditions'
1203 } 1202 }
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698