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

Side by Side Diff: content/content_renderer.gypi

Issue 23978005: Fix build breakage on chrome-for-tv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolved Yuncheol's comment Created 7 years, 3 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
« content/content_common.gypi ('K') | « content/content_common.gypi ('k') | no next file » | 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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 ['OS=="win" and win_use_allocator_shim==1', { 533 ['OS=="win" and win_use_allocator_shim==1', {
534 'dependencies': [ 534 'dependencies': [
535 '../base/allocator/allocator.gyp:allocator', 535 '../base/allocator/allocator.gyp:allocator',
536 ], 536 ],
537 }], 537 }],
538 ['OS=="android"', { 538 ['OS=="android"', {
539 'sources!': [ 539 'sources!': [
540 'renderer/accessibility/renderer_accessibility_focus_only.cc' 540 'renderer/accessibility/renderer_accessibility_focus_only.cc'
541 'renderer/media/audio_decoder.cc', 541 'renderer/media/audio_decoder.cc',
542 'renderer/media/filter_helpers.cc', 542 'renderer/media/filter_helpers.cc',
543 'renderer/media/pepper_platform_video_decoder.cc',
544 'renderer/media/webmediaplayer_impl.cc', 543 'renderer/media/webmediaplayer_impl.cc',
545 ], 544 ],
545 'conditions': [
546 ['enable_plugins!=1', {
jam 2013/09/06 16:22:51 ditto
kjyoun 2013/09/10 02:21:25 Done.
547 'sources!' : [
548 'renderer/media/pepper_platform_video_decoder.cc',
549 ],
550 }],
551 ],
546 'dependencies': [ 552 'dependencies': [
547 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 553 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
548 ], 554 ],
549 'includes': [ 555 'includes': [
550 '../build/android/cpufeatures.gypi', 556 '../build/android/cpufeatures.gypi',
551 ], 557 ],
552 }, { 558 }, {
553 'sources!': [ 559 'sources!': [
554 'renderer/java/java_bridge_channel.cc', 560 'renderer/java/java_bridge_channel.cc',
555 'renderer/java/java_bridge_channel.h', 561 'renderer/java/java_bridge_channel.h',
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 }], 732 }],
727 ], 733 ],
728 'target_conditions': [ 734 'target_conditions': [
729 ['OS=="android"', { 735 ['OS=="android"', {
730 'sources/': [ 736 'sources/': [
731 ['include', '^renderer/render_view_linux\\.cc$'], 737 ['include', '^renderer/render_view_linux\\.cc$'],
732 ], 738 ],
733 }], 739 }],
734 ], 740 ],
735 } 741 }
OLDNEW
« content/content_common.gypi ('K') | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698