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

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 / rebase 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 # Note on Win64 targets: targets that end with win64 be used 149 # Note on Win64 targets: targets that end with win64 be used
150 # on 64-bit Windows only. Targets that end with nacl_win64 should be used 150 # on 64-bit Windows only. Targets that end with nacl_win64 should be used
151 # by Native Client only. 151 # by Native Client only.
152 # NOTE: Most new includes should go in the OS!="ios" condition below. 152 # NOTE: Most new includes should go in the OS!="ios" condition below.
153 '../build/win_precompile.gypi', 153 '../build/win_precompile.gypi',
154 'chrome_browser.gypi', 154 'chrome_browser.gypi',
155 'chrome_browser_ui.gypi', 155 'chrome_browser_ui.gypi',
156 'chrome_common.gypi', 156 'chrome_common.gypi',
157 'chrome_installer_util.gypi', 157 'chrome_installer_util.gypi',
158 'chrome_tests_unit.gypi', 158 'chrome_tests_unit.gypi',
159 'browser/metro_utils/metro_utils.gypi',
gab 2013/05/13 13:27:43 This is Windows only and should go in the OS=="win
koz (OOO until 15th September) 2013/05/14 08:39:54 Done.
160 'policy.gypi',
159 'version.gypi', 161 'version.gypi',
160 ], 162 ],
161 'conditions': [ 163 'conditions': [
162 ['OS!="ios"', { 164 ['OS!="ios"', {
163 'includes': [ 165 'includes': [
164 'app/policy/policy_templates.gypi', 166 'app/policy/policy_templates.gypi',
165 'chrome_browser_extensions.gypi', 167 'chrome_browser_extensions.gypi',
166 'chrome_dll.gypi', 168 'chrome_dll.gypi',
167 'chrome_exe.gypi', 169 'chrome_exe.gypi',
168 'chrome_installer.gypi', 170 'chrome_installer.gypi',
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 '../build/java.gypi', 1149 '../build/java.gypi',
1148 ], 1150 ],
1149 }, 1151 },
1150 ], # 'targets' 1152 ], # 'targets'
1151 'includes': [ 1153 'includes': [
1152 'chrome_android.gypi', 1154 'chrome_android.gypi',
1153 ]}, # 'includes' 1155 ]}, # 'includes'
1154 ], # OS=="android" 1156 ], # OS=="android"
1155 ], # 'conditions' 1157 ], # 'conditions'
1156 } 1158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698