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

Side by Side Diff: content/content_renderer.gypi

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « content/content_common.gypi ('k') | content/content_shell.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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../jingle/jingle.gyp:jingle_glue', 7 '../jingle/jingle.gyp:jingle_glue',
8 '../media/media.gyp:media', 8 '../media/media.gyp:media',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 }], 523 }],
524 ['toolkit_uses_gtk == 1', { 524 ['toolkit_uses_gtk == 1', {
525 'dependencies': [ 525 'dependencies': [
526 '../build/linux/system.gyp:gtk', 526 '../build/linux/system.gyp:gtk',
527 ], 527 ],
528 }], 528 }],
529 ['OS=="mac"', { 529 ['OS=="mac"', {
530 'sources!': [ 530 'sources!': [
531 'common/process_watcher_posix.cc', 531 'common/process_watcher_posix.cc',
532 ], 532 ],
533 'link_settings': {
534 'libraries': [
535 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
536 ],
537 },
533 }], 538 }],
534 ['OS=="win" and win_use_allocator_shim==1', { 539 ['OS=="win" and win_use_allocator_shim==1', {
535 'dependencies': [ 540 'dependencies': [
536 '../base/allocator/allocator.gyp:allocator', 541 '../base/allocator/allocator.gyp:allocator',
537 ], 542 ],
538 }], 543 }],
539 ['OS=="android"', { 544 ['OS=="android"', {
540 'sources!': [ 545 'sources!': [
541 'renderer/accessibility/renderer_accessibility_focus_only.cc' 546 'renderer/accessibility/renderer_accessibility_focus_only.cc'
542 'renderer/media/audio_decoder.cc', 547 'renderer/media/audio_decoder.cc',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 }], 727 }],
723 ], 728 ],
724 'target_conditions': [ 729 'target_conditions': [
725 ['OS=="android"', { 730 ['OS=="android"', {
726 'sources/': [ 731 'sources/': [
727 ['include', '^renderer/render_view_linux\\.cc$'], 732 ['include', '^renderer/render_view_linux\\.cc$'],
728 ], 733 ],
729 }], 734 }],
730 ], 735 ],
731 } 736 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698