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

Side by Side Diff: chrome/chrome.gyp

Issue 14794004: Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (reland) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: browser in condition Created 7 years, 7 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/app/chrome_main_delegate.cc ('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_dependencies': [ 13 'chromium_browser_dependencies': [
14 'common', 14 'common',
15 'browser', 15 'browser',
16 '../content/content.gyp:content_app', 16 '../content/content.gyp:content_app',
17 '../sync/sync.gyp:sync', 17 '../sync/sync.gyp:sync',
18 ], 18 ],
19 'chromium_child_dependencies': [
20 'common',
21 '../content/content.gyp:content_app',
22 '../sync/sync.gyp:sync',
23 ],
19 'allocator_target': '../base/allocator/allocator.gyp:allocator', 24 'allocator_target': '../base/allocator/allocator.gyp:allocator',
20 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 25 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
21 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 26 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
22 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 27 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
23 # TODO: remove this helper when we have loops in GYP 28 # TODO: remove this helper when we have loops in GYP
24 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 29 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
25 'conditions': [ 30 'conditions': [
26 ['OS!="ios"', { 31 ['OS!="ios"', {
27 'chromium_dependencies': [ 32 'chromium_browser_dependencies': [
33 'debugger',
34 '../content/content.gyp:content_ppapi_plugin',
35 '../printing/printing.gyp:printing',
36 ],
37 'chromium_child_dependencies': [
28 'debugger', 38 'debugger',
29 'plugin', 39 'plugin',
30 'renderer', 40 'renderer',
31 'utility', 41 'utility',
32 '../content/content.gyp:content_gpu', 42 '../content/content.gyp:content_gpu',
33 '../content/content.gyp:content_ppapi_plugin', 43 '../content/content.gyp:content_ppapi_plugin',
34 '../content/content.gyp:content_worker', 44 '../content/content.gyp:content_worker',
35 '../printing/printing.gyp:printing', 45 '../printing/printing.gyp:printing',
36 '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_ resources', 46 '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_ resources',
37 ], 47 ],
38 }], 48 }],
39 ['OS=="win"', { 49 ['OS=="win"', {
40 'nacl_defines': [ 50 'nacl_defines': [
41 'NACL_WINDOWS=1', 51 'NACL_WINDOWS=1',
42 'NACL_LINUX=0', 52 'NACL_LINUX=0',
43 'NACL_OSX=0', 53 'NACL_OSX=0',
44 ], 54 ],
45 'platform_locale_settings_grd': 55 'platform_locale_settings_grd':
46 'app/resources/locale_settings_win.grd', 56 'app/resources/locale_settings_win.grd',
47 },], 57 },],
48 ['OS!="android" and OS!="ios"', { 58 ['OS!="android" and OS!="ios"', {
49 'chromium_dependencies': [ 59 'chromium_browser_dependencies': [
50 # Android doesn't use the service process (only needed for print). 60 # Android doesn't use the service process (only needed for print).
51 'service', 61 'service',
52 ], 62 ],
53 }], 63 }],
54 ['OS=="linux"', { 64 ['OS=="linux"', {
55 'nacl_defines': [ 65 'nacl_defines': [
56 'NACL_WINDOWS=0', 66 'NACL_WINDOWS=0',
57 'NACL_LINUX=1', 67 'NACL_LINUX=1',
58 'NACL_OSX=0', 68 'NACL_OSX=0',
59 ], 69 ],
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 '../build/java.gypi', 1147 '../build/java.gypi',
1138 ], 1148 ],
1139 }, 1149 },
1140 ], # 'targets' 1150 ], # 'targets'
1141 'includes': [ 1151 'includes': [
1142 'chrome_android.gypi', 1152 'chrome_android.gypi',
1143 ]}, # 'includes' 1153 ]}, # 'includes'
1144 ], # OS=="android" 1154 ], # OS=="android"
1145 ], # 'conditions' 1155 ], # 'conditions'
1146 } 1156 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698