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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 'variables': { 43 'variables': {
44 'enable_wexit_time_destructors': 1, 44 'enable_wexit_time_destructors': 1,
45 }, 45 },
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/gfx/compositor/compositor.gyp:compositor', 53 '../ui/compositor/compositor.gyp:compositor',
54 ], 54 ],
55 }], 55 }],
56 ['OS=="win"', { 56 ['OS=="win"', {
57 'product_name': 'chrome', 57 'product_name': 'chrome',
58 'dependencies': [ 58 'dependencies': [
59 # On Windows, link the dependencies (libraries) that make 59 # On Windows, link the dependencies (libraries) that make
60 # up actual Chromium functionality into this .dll. 60 # up actual Chromium functionality into this .dll.
61 'chrome_resources.gyp:chrome_resources', 61 'chrome_resources.gyp:chrome_resources',
62 'chrome_version_resources', 62 'chrome_version_resources',
63 'installer_util_strings', 63 'installer_util_strings',
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 ], 540 ],
541 }], 541 }],
542 ], # conditions 542 ], # conditions
543 }], # OS=="mac" 543 }], # OS=="mac"
544 ], # conditions 544 ], # conditions
545 }, # target chrome_dll 545 }, # target chrome_dll
546 ], # targets 546 ], # targets
547 }], # OS=="mac" or OS=="win" 547 }], # OS=="mac" or OS=="win"
548 ], 548 ],
549 } 549 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698