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

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: ADD README.chromium 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
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 ], 156 ],
157 'include_dirs': [ 157 'include_dirs': [
158 '../../third_party/GTM', 158 '../../third_party/google_toolbox_for_mac/src',
Mark Mentovai 2013/12/13 23:03:20 As discussed, don’t include_dirs here, just get it
tfarina 2013/12/16 02:42:03 Done.
tfarina 2013/12/16 02:42:03 Done.
159 ], 159 ],
160 'link_settings': { 160 'link_settings': {
161 'libraries': [ 161 'libraries': [
162 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 162 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
163 ], 163 ],
164 }, 164 },
165 }, { # OS!="mac" 165 }, { # OS!="mac"
166 'sources/': [ 166 'sources/': [
167 ['exclude', 'cocoa/'], 167 ['exclude', 'cocoa/'],
168 ], 168 ],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 'dependencies': [ 268 'dependencies': [
269 '../../base/allocator/allocator.gyp:allocator', 269 '../../base/allocator/allocator.gyp:allocator',
270 ], 270 ],
271 }], 271 }],
272 ], 272 ],
273 # Disable c4267 warnings until we fix size_t to int truncations. 273 # Disable c4267 warnings until we fix size_t to int truncations.
274 'msvs_disabled_warnings': [ 4267, ], 274 'msvs_disabled_warnings': [ 4267, ],
275 }, 275 },
276 ], 276 ],
277 } 277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698