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

Side by Side Diff: chrome/chrome.gyp

Issue 14617003: Make chrome.exe rendezvous with existing chrome process earlier. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments 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
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ['OS!="ios"', { 162 ['OS!="ios"', {
163 'includes': [ 163 'includes': [
164 'app/policy/policy_templates.gypi', 164 'app/policy/policy_templates.gypi',
165 'chrome_browser_extensions.gypi', 165 'chrome_browser_extensions.gypi',
166 'chrome_dll.gypi', 166 'chrome_dll.gypi',
167 'chrome_exe.gypi', 167 'chrome_exe.gypi',
168 'chrome_installer.gypi', 168 'chrome_installer.gypi',
169 'chrome_renderer.gypi', 169 'chrome_renderer.gypi',
170 'chrome_tests.gypi', 170 'chrome_tests.gypi',
171 'nacl.gypi', 171 'nacl.gypi',
172 'policy.gypi',
172 '../apps/apps.gypi', 173 '../apps/apps.gypi',
173 ], 174 ],
174 'targets': [ 175 'targets': [
175 { 176 {
176 'target_name': 'default_extensions', 177 'target_name': 'default_extensions',
177 'type': 'none', 178 'type': 'none',
178 'conditions': [ 179 'conditions': [
179 ['OS=="win"', { 180 ['OS=="win"', {
180 'copies': [ 181 'copies': [
181 { 182 {
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 ], 871 ],
871 'dependencies': [ 872 'dependencies': [
872 'test_support_common', 873 'test_support_common',
873 '../skia/skia.gyp:skia', 874 '../skia/skia.gyp:skia',
874 ], 875 ],
875 'sources': [ 876 'sources': [
876 'tools/ipclist/ipcfuzz.cc', 877 'tools/ipclist/ipcfuzz.cc',
877 ], 878 ],
878 }, 879 },
879 ], 880 ],
880 },], # OS=="linux" 881 }], # OS=="linux"
881 ['OS=="win"', 882 ['OS=="win"',
882 { 'targets': [ 883 { 'targets': [
883 { 884 {
884 # For historical reasons, chrome/chrome.sln has been the entry point 885 # For historical reasons, chrome/chrome.sln has been the entry point
885 # for new Chrome developers. To assist development, include several 886 # for new Chrome developers. To assist development, include several
886 # core unittests that are otherwise only accessible side-by-side with 887 # core unittests that are otherwise only accessible side-by-side with
887 # chrome via all/all.sln. 888 # chrome via all/all.sln.
888 'target_name': 'test_targets', 889 'target_name': 'test_targets',
889 'type': 'none', 890 'type': 'none',
890 'dependencies': [ 891 'dependencies': [
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 'dependencies': [ 1043 'dependencies': [
1043 '../base/base.gyp:base', 1044 '../base/base.gyp:base',
1044 'safe_browsing_proto', 1045 'safe_browsing_proto',
1045 ], 1046 ],
1046 'sources': [ 1047 'sources': [
1047 'browser/safe_browsing/signature_util.h', 1048 'browser/safe_browsing/signature_util.h',
1048 'browser/safe_browsing/signature_util_win.cc', 1049 'browser/safe_browsing/signature_util_win.cc',
1049 'tools/safe_browsing/sb_sigutil.cc', 1050 'tools/safe_browsing/sb_sigutil.cc',
1050 ], 1051 ],
1051 }, 1052 },
1052 ]}, # 'targets' 1053 ], # 'targets'
1053 ], # OS=="win" 1054 'includes': [
1055 'browser/metro_utils/metro_utils.gypi',
Mark Mentovai 2013/05/15 13:37:06 Included gypi files should be in the same director
koz (OOO until 15th September) 2013/05/17 00:12:42 Done.
1056 ],
1057 }], # OS=="win"
1054 ['OS=="win" and target_arch=="ia32"', 1058 ['OS=="win" and target_arch=="ia32"',
1055 { 'targets': [ 1059 { 'targets': [
1056 { 1060 {
1057 'target_name': 'chrome_user32_delay_imports', 1061 'target_name': 'chrome_user32_delay_imports',
1058 'type': 'none', 1062 'type': 'none',
1059 'variables': { 1063 'variables': {
1060 'lib_dir': '<(INTERMEDIATE_DIR)', 1064 'lib_dir': '<(INTERMEDIATE_DIR)',
1061 }, 1065 },
1062 'sources': [ 1066 'sources': [
1063 'chrome.user32.delay.imports' 1067 'chrome.user32.delay.imports'
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 '../build/java.gypi', 1151 '../build/java.gypi',
1148 ], 1152 ],
1149 }, 1153 },
1150 ], # 'targets' 1154 ], # 'targets'
1151 'includes': [ 1155 'includes': [
1152 'chrome_android.gypi', 1156 'chrome_android.gypi',
1153 ]}, # 'includes' 1157 ]}, # 'includes'
1154 ], # OS=="android" 1158 ], # OS=="android"
1155 ], # 'conditions' 1159 ], # 'conditions'
1156 } 1160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698