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

Side by Side Diff: content/content_browser.gypi

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and fixed some nits Created 9 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'content_browser', 8 'target_name': 'content_browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'dependencies': [ 10 'dependencies': [
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 'browser/renderer_host/p2p/socket_host_tcp_server.h', 352 'browser/renderer_host/p2p/socket_host_tcp_server.h',
353 'browser/renderer_host/p2p/socket_host_udp.cc', 353 'browser/renderer_host/p2p/socket_host_udp.cc',
354 'browser/renderer_host/p2p/socket_host_udp.h', 354 'browser/renderer_host/p2p/socket_host_udp.h',
355 'browser/renderer_host/p2p/socket_dispatcher_host.cc', 355 'browser/renderer_host/p2p/socket_dispatcher_host.cc',
356 'browser/renderer_host/p2p/socket_dispatcher_host.h', 356 'browser/renderer_host/p2p/socket_dispatcher_host.h',
357 ], 357 ],
358 }], 358 }],
359 ['OS=="win"', { 359 ['OS=="win"', {
360 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442', 360 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442',
361 }], 361 }],
362 ['OS=="linux"', { 362 ['os_posix==1 and OS!="mac"', {
363 'dependencies': [ 363 'dependencies': [
364 '../build/linux/system.gyp:dbus-glib', 364 '../build/linux/system.gyp:dbus-glib',
365 # For FcLangSetAdd call in render_sandbox_host_linux.cc 365 # For FcLangSetAdd call in render_sandbox_host_linux.cc
366 '../build/linux/system.gyp:fontconfig', 366 '../build/linux/system.gyp:fontconfig',
367 '../build/linux/system.gyp:gtk', 367 '../build/linux/system.gyp:gtk',
Evan Stade 2011/05/17 00:46:12 so now I am confused, I thought you would have put
368 # For XShm* in backing_store_x.cc 368 # For XShm* in backing_store_x.cc
369 '../build/linux/system.gyp:x11', 369 '../build/linux/system.gyp:x11',
370 ], 370 ],
371 }], 371 }],
372 ['OS=="linux" and chromeos==1', { 372 ['OS=="linux" and chromeos==1', {
373 'sources/': [ 373 'sources/': [
374 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'], 374 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
375 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'], 375 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
376 ] 376 ]
377 }], 377 }],
378 ['OS=="mac"', { 378 ['OS=="mac"', {
379 'link_settings': { 379 'link_settings': {
380 'mac_bundle_resources': [ 380 'mac_bundle_resources': [
381 'browser/gpu.sb', 381 'browser/gpu.sb',
382 'browser/worker.sb', 382 'browser/worker.sb',
383 ], 383 ],
384 }, 384 },
385 }], 385 }],
386 ], 386 ],
387 }, 387 },
388 ], 388 ],
389 } 389 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698