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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 11026075: Include wallpaper to win_aura's executables (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « ash/resources/ash_wallpaper_resources.grd ('k') | chrome/chrome_resources.gyp » ('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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'dependencies': [ 46 'dependencies': [
47 '<@(chromium_dependencies)', 47 '<@(chromium_dependencies)',
48 'app/policy/cloud_policy_codegen.gyp:policy', 48 'app/policy/cloud_policy_codegen.gyp:policy',
49 ], 49 ],
50 'conditions': [ 50 'conditions': [
51 ['use_aura==1', { 51 ['use_aura==1', {
52 'dependencies': [ 52 'dependencies': [
53 '../ui/compositor/compositor.gyp:compositor', 53 '../ui/compositor/compositor.gyp:compositor',
54 ], 54 ],
55 }], 55 }],
56 ['use_ash==1', {
57 'sources': [
58 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_reso urces.rc',
59 ],
60 }],
56 ['OS=="win"', { 61 ['OS=="win"', {
57 'product_name': 'chrome', 62 'product_name': 'chrome',
58 'dependencies': [ 63 'dependencies': [
59 # On Windows, link the dependencies (libraries) that make 64 # On Windows, link the dependencies (libraries) that make
60 # up actual Chromium functionality into this .dll. 65 # up actual Chromium functionality into this .dll.
61 'chrome_resources.gyp:chrome_resources', 66 'chrome_resources.gyp:chrome_resources',
62 'chrome_version_resources', 67 'chrome_version_resources',
63 '../content/content.gyp:content_worker', 68 '../content/content.gyp:content_worker',
64 '../crypto/crypto.gyp:crypto', 69 '../crypto/crypto.gyp:crypto',
65 '../printing/printing.gyp:printing', 70 '../printing/printing.gyp:printing',
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 ], 492 ],
488 }], 493 }],
489 ], # conditions 494 ], # conditions
490 }], # OS=="mac" 495 }], # OS=="mac"
491 ], # conditions 496 ], # conditions
492 }, # target chrome_dll 497 }, # target chrome_dll
493 ], # targets 498 ], # targets
494 }], # OS=="mac" or OS=="win" 499 }], # OS=="mac" or OS=="win"
495 ], 500 ],
496 } 501 }
OLDNEW
« no previous file with comments | « ash/resources/ash_wallpaper_resources.grd ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698