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

Side by Side Diff: chrome/chrome.gyp

Issue 14682014: Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ifdef out some code based on chrome_split_dll to get chrome_browser linking 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
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',
18 ],
19 'chromium_child_dependencies': [
20 'common',
21 'browser',
jam 2013/05/07 20:56:24 why does child depend on browser?
scottmg 2013/05/07 22:41:03 Haven't started on getting child to actually build
jam 2013/05/07 23:08:16 it's still there?
22 '../content/content.gyp:content_app',
17 '../sync/sync.gyp:sync', 23 '../sync/sync.gyp:sync',
18 ], 24 ],
19 'allocator_target': '../base/allocator/allocator.gyp:allocator', 25 'allocator_target': '../base/allocator/allocator.gyp:allocator',
20 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 26 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
21 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 27 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
22 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 28 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
23 # TODO: remove this helper when we have loops in GYP 29 # TODO: remove this helper when we have loops in GYP
24 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 30 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
25 'conditions': [ 31 'conditions': [
26 ['OS!="ios"', { 32 ['OS!="ios"', {
27 'chromium_dependencies': [ 33 'chromium_browser_dependencies': [
jam 2013/05/07 20:56:24 i'm a bit confused: why does browser depend on plu
scottmg 2013/05/07 22:41:03 No good reason. Mostly just to get something check
34 'debugger',
35 'plugin',
36 'utility',
37 '../content/content.gyp:content_ppapi_plugin',
38 '../printing/printing.gyp:printing',
39 ],
40 'chromium_child_dependencies': [
28 'debugger', 41 'debugger',
29 'plugin', 42 'plugin',
30 'renderer', 43 'renderer',
31 'utility', 44 'utility',
32 '../content/content.gyp:content_gpu', 45 '../content/content.gyp:content_gpu',
33 '../content/content.gyp:content_ppapi_plugin', 46 '../content/content.gyp:content_ppapi_plugin',
34 '../content/content.gyp:content_worker', 47 '../content/content.gyp:content_worker',
35 '../printing/printing.gyp:printing', 48 '../printing/printing.gyp:printing',
36 '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_ resources', 49 '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_ resources',
37 ], 50 ],
38 }], 51 }],
39 ['OS=="win"', { 52 ['OS=="win"', {
40 'nacl_defines': [ 53 'nacl_defines': [
41 'NACL_WINDOWS=1', 54 'NACL_WINDOWS=1',
42 'NACL_LINUX=0', 55 'NACL_LINUX=0',
43 'NACL_OSX=0', 56 'NACL_OSX=0',
44 ], 57 ],
45 'platform_locale_settings_grd': 58 'platform_locale_settings_grd':
46 'app/resources/locale_settings_win.grd', 59 'app/resources/locale_settings_win.grd',
47 },], 60 },],
48 ['OS!="android" and OS!="ios"', { 61 ['OS!="android" and OS!="ios"', {
49 'chromium_dependencies': [ 62 'chromium_browser_dependencies': [
50 # Android doesn't use the service process (only needed for print). 63 # Android doesn't use the service process (only needed for print).
51 'service', 64 'service',
52 ], 65 ],
66 'chromium_child_dependencies': [
67 # Android doesn't use the service process (only needed for print).
68 'service',
69 ],
53 }], 70 }],
54 ['OS=="linux"', { 71 ['OS=="linux"', {
55 'nacl_defines': [ 72 'nacl_defines': [
56 'NACL_WINDOWS=0', 73 'NACL_WINDOWS=0',
57 'NACL_LINUX=1', 74 'NACL_LINUX=1',
58 'NACL_OSX=0', 75 'NACL_OSX=0',
59 ], 76 ],
60 'conditions': [ 77 'conditions': [
61 ['chromeos==1', { 78 ['chromeos==1', {
62 'conditions': [ 79 'conditions': [
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 '../build/java.gypi', 1154 '../build/java.gypi',
1138 ], 1155 ],
1139 }, 1156 },
1140 ], # 'targets' 1157 ], # 'targets'
1141 'includes': [ 1158 'includes': [
1142 'chrome_android.gypi', 1159 'chrome_android.gypi',
1143 ]}, # 'includes' 1160 ]}, # 'includes'
1144 ], # OS=="android" 1161 ], # OS=="android"
1145 ], # 'conditions' 1162 ], # 'conditions'
1146 } 1163 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698