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

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: 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 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 ['OS=="win" and win_use_allocator_shim==1', { 527 ['OS=="win" and win_use_allocator_shim==1', {
528 'dependencies': [ 528 'dependencies': [
529 '../base/allocator/allocator.gyp:allocator', 529 '../base/allocator/allocator.gyp:allocator',
530 ], 530 ],
531 }], 531 }],
532 ['OS=="android"', { 532 ['OS=="android"', {
533 'sources!': [ 533 'sources!': [
534 'renderer/accessibility/renderer_accessibility_focus_only.cc' 534 'renderer/accessibility/renderer_accessibility_focus_only.cc'
535 'renderer/media/audio_decoder.cc', 535 'renderer/media/audio_decoder.cc',
536 'renderer/media/filter_helpers.cc', 536 'renderer/media/filter_helpers.cc',
537 'renderer/media/pepper_platform_video_decoder.cc',
538 'renderer/media/webmediaplayer_impl.cc', 537 'renderer/media/webmediaplayer_impl.cc',
539 ], 538 ],
540 'dependencies': [ 539 'dependencies': [
541 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 540 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
542 ], 541 ],
543 'includes': [ 542 'includes': [
544 '../build/android/cpufeatures.gypi', 543 '../build/android/cpufeatures.gypi',
545 ], 544 ],
546 }, { 545 }, {
547 'sources!': [ 546 'sources!': [
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 '../ppapi/ppapi_internal.gyp:ppapi_host', 667 '../ppapi/ppapi_internal.gyp:ppapi_host',
669 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 668 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
670 '../ppapi/ppapi_internal.gyp:ppapi_shared', 669 '../ppapi/ppapi_internal.gyp:ppapi_shared',
671 ], 670 ],
672 }, { # enable_plugins==0 671 }, { # enable_plugins==0
673 'sources/': [ 672 'sources/': [
674 ['exclude', '^renderer/npapi/'], 673 ['exclude', '^renderer/npapi/'],
675 ['exclude', '^renderer/pepper/'], 674 ['exclude', '^renderer/pepper/'],
676 ], 675 ],
677 'sources!': [ 676 'sources!': [
677 'renderer/media/pepper_platform_video_decoder.cc',
678 'renderer/media/video_destination_handler.cc', 678 'renderer/media/video_destination_handler.cc',
679 'renderer/media/video_destination_handler.h', 679 'renderer/media/video_destination_handler.h',
680 'renderer/render_widget_fullscreen_pepper.cc', 680 'renderer/render_widget_fullscreen_pepper.cc',
681 'renderer/render_widget_fullscreen_pepper.h', 681 'renderer/render_widget_fullscreen_pepper.h',
682 ], 682 ],
683 }], 683 }],
684 ['enable_pepper_cdms != 1', { 684 ['enable_pepper_cdms != 1', {
685 'sources!': [ 685 'sources!': [
686 'renderer/media/crypto/ppapi_decryptor.cc', 686 'renderer/media/crypto/ppapi_decryptor.cc',
687 'renderer/media/crypto/ppapi_decryptor.h', 687 'renderer/media/crypto/ppapi_decryptor.h',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 }], 720 }],
721 ], 721 ],
722 'target_conditions': [ 722 'target_conditions': [
723 ['OS=="android"', { 723 ['OS=="android"', {
724 'sources/': [ 724 'sources/': [
725 ['include', '^renderer/render_view_linux\\.cc$'], 725 ['include', '^renderer/render_view_linux\\.cc$'],
726 ], 726 ],
727 }], 727 }],
728 ], 728 ],
729 } 729 }
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