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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 1741010: gyp: unify toolkit_views usage (Closed)
Patch Set: Created 10 years, 8 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
OLDNEW
1 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009-2010 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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 'conditions': [ 207 'conditions': [
208 ['branding=="Chrome"', { 208 ['branding=="Chrome"', {
209 'files': ['app/theme/google_chrome/product_logo_48.png'] 209 'files': ['app/theme/google_chrome/product_logo_48.png']
210 }, { # else: 'branding!="Chrome" 210 }, { # else: 'branding!="Chrome"
211 'files': ['app/theme/chromium/product_logo_48.png'] 211 'files': ['app/theme/chromium/product_logo_48.png']
212 }], 212 }],
213 ], 213 ],
214 }, 214 },
215 ], 215 ],
216 }], 216 }],
217 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
sky 2010/04/27 14:50:13 Where is this dependency expressed now?
Evan Martin 2010/04/27 16:17:54 Since the dependency isn't expressed in the win br
218 'dependencies': [
219 '../views/views.gyp:views',
220 ],
221 }],
222 ['OS=="mac"', { 217 ['OS=="mac"', {
223 'variables': { 218 'variables': {
224 'mac_packaging_dir': 219 'mac_packaging_dir':
225 '<(PRODUCT_DIR)/<(mac_product_name) Packaging', 220 '<(PRODUCT_DIR)/<(mac_product_name) Packaging',
226 # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't 221 # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't
227 # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is 222 # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is
228 # needed. 223 # needed.
229 'mac_packaging_sh_dir': 224 'mac_packaging_sh_dir':
230 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging', 225 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging',
231 }, 226 },
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 'configurations': { 591 'configurations': {
597 'Common_Base': { 592 'Common_Base': {
598 'msvs_target_platform': 'x64', 593 'msvs_target_platform': 'x64',
599 }, 594 },
600 }, 595 },
601 }, 596 },
602 ], 597 ],
603 }], 598 }],
604 ], 599 ],
605 } 600 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698