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

Side by Side Diff: ui/app_list/app_list.gyp

Issue 107933006: Get rid of ui_cocoa_third_party_toolkits target from ui.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark review Created 7 years 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 | « ui/app_list/DEPS ('k') | ui/app_list/cocoa/apps_search_box_controller.mm » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 '../views/controls/webview/webview.gyp:webview', 145 '../views/controls/webview/webview.gyp:webview',
146 '../views/views.gyp:views', 146 '../views/views.gyp:views',
147 ], 147 ],
148 }, { # toolkit_views==0 148 }, { # toolkit_views==0
149 'sources/': [ 149 'sources/': [
150 ['exclude', 'views/'], 150 ['exclude', 'views/'],
151 ], 151 ],
152 }], 152 }],
153 ['OS=="mac"', { 153 ['OS=="mac"', {
154 'dependencies': [ 154 'dependencies': [
155 '../ui.gyp:ui_cocoa_third_party_toolkits', 155 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp :google_toolbox_for_mac',
156 ],
157 'include_dirs': [
158 '../../third_party/GTM',
159 ], 156 ],
160 'link_settings': { 157 'link_settings': {
161 'libraries': [ 158 'libraries': [
162 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 159 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
163 ], 160 ],
164 }, 161 },
165 }, { # OS!="mac" 162 }, { # OS!="mac"
166 'sources/': [ 163 'sources/': [
167 ['exclude', 'cocoa/'], 164 ['exclude', 'cocoa/'],
168 ], 165 ],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 'dependencies': [ 265 'dependencies': [
269 '../../base/allocator/allocator.gyp:allocator', 266 '../../base/allocator/allocator.gyp:allocator',
270 ], 267 ],
271 }], 268 }],
272 ], 269 ],
273 # Disable c4267 warnings until we fix size_t to int truncations. 270 # Disable c4267 warnings until we fix size_t to int truncations.
274 'msvs_disabled_warnings': [ 4267, ], 271 'msvs_disabled_warnings': [ 4267, ],
275 }, 272 },
276 ], 273 ],
277 } 274 }
OLDNEW
« no previous file with comments | « ui/app_list/DEPS ('k') | ui/app_list/cocoa/apps_search_box_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698