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

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

Issue 61923004: Clean up uses of use_glib that are not related to glib dependencies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: desktop_linux == 1 or chromeos == 1 Created 7 years, 1 month 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 ['component=="static_library"', { 219 ['component=="static_library"', {
220 # Needed to link to Obj-C static libraries. 220 # Needed to link to Obj-C static libraries.
221 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 221 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
222 }], 222 }],
223 ], 223 ],
224 }, { # OS!="mac" 224 }, { # OS!="mac"
225 'sources/': [ 225 'sources/': [
226 ['exclude', 'cocoa/'], 226 ['exclude', 'cocoa/'],
227 ], 227 ],
228 }], 228 }],
229 ['use_glib == 1 or OS == "ios"', { 229 ['desktop_linux == 1 or chromeos == 1 or OS == "ios"', {
230 'dependencies': [ 230 'dependencies': [
231 '../base/strings/ui_strings.gyp:ui_unittest_strings', 231 '../base/strings/ui_strings.gyp:ui_unittest_strings',
232 ], 232 ],
233 }], 233 }],
234 # See http://crbug.com/162998#c4 for why this is needed. 234 # See http://crbug.com/162998#c4 for why this is needed.
235 ['OS=="linux" and linux_use_tcmalloc==1', { 235 ['OS=="linux" and linux_use_tcmalloc==1', {
236 'dependencies': [ 236 'dependencies': [
237 '../../base/allocator/allocator.gyp:allocator', 237 '../../base/allocator/allocator.gyp:allocator',
238 # The following two dependencies provide the missing 238 # The following two dependencies provide the missing
239 # symbol HeapProfilerStart in Linux component builds. 239 # symbol HeapProfilerStart in Linux component builds.
240 # They probably can be removed after http://crbug.com/263316 240 # They probably can be removed after http://crbug.com/263316
241 '../../webkit/child/webkit_child.gyp:webkit_child', 241 '../../webkit/child/webkit_child.gyp:webkit_child',
242 '../../webkit/glue/webkit_glue.gyp:glue', 242 '../../webkit/glue/webkit_glue.gyp:glue',
243 ], 243 ],
244 }], 244 }],
245 ['OS=="win" and win_use_allocator_shim==1', { 245 ['OS=="win" and win_use_allocator_shim==1', {
246 'dependencies': [ 246 'dependencies': [
247 '../../base/allocator/allocator.gyp:allocator', 247 '../../base/allocator/allocator.gyp:allocator',
248 ], 248 ],
249 }], 249 }],
250 ], 250 ],
251 # Disable c4267 warnings until we fix size_t to int truncations. 251 # Disable c4267 warnings until we fix size_t to int truncations.
252 'msvs_disabled_warnings': [ 4267, ], 252 'msvs_disabled_warnings': [ 4267, ],
253 }, 253 },
254 ], 254 ],
255 } 255 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698