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

Side by Side Diff: media/media.gyp

Issue 411523005: Revert of Clean up. Experimental user avatars removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « media/formats/webm/chromeos/webm_encoder.cc ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 ['android_webview_build==0', { 643 ['android_webview_build==0', {
644 'dependencies': [ 644 'dependencies': [
645 'media_java', 645 'media_java',
646 ], 646 ],
647 }], 647 }],
648 ], 648 ],
649 'defines': [ 649 'defines': [
650 'DISABLE_USER_INPUT_MONITOR', 650 'DISABLE_USER_INPUT_MONITOR',
651 ], 651 ],
652 }], 652 }],
653 # A simple WebM encoder for animated avatars on ChromeOS.
654 ['chromeos==1', {
655 'dependencies': [
656 '../third_party/libvpx/libvpx.gyp:libvpx',
657 '../third_party/libyuv/libyuv.gyp:libyuv',
658 ],
659 'sources': [
660 'formats/webm/chromeos/ebml_writer.cc',
661 'formats/webm/chromeos/ebml_writer.h',
662 'formats/webm/chromeos/webm_encoder.cc',
663 'formats/webm/chromeos/webm_encoder.h',
664 ],
665 }],
653 # For VaapiVideoEncodeAccelerator. 666 # For VaapiVideoEncodeAccelerator.
654 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 667 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
655 'sources': [ 668 'sources': [
656 'filters/h264_bitstream_buffer.cc', 669 'filters/h264_bitstream_buffer.cc',
657 'filters/h264_bitstream_buffer.h', 670 'filters/h264_bitstream_buffer.h',
658 ], 671 ],
659 }], 672 }],
660 ['OS!="ios"', { 673 ['OS!="ios"', {
661 'dependencies': [ 674 'dependencies': [
662 '../third_party/libyuv/libyuv.gyp:libyuv', 675 '../third_party/libyuv/libyuv.gyp:libyuv',
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 ], 1761 ],
1749 }], 1762 }],
1750 ], 1763 ],
1751 }], 1764 }],
1752 ], 1765 ],
1753 }, 1766 },
1754 ], 1767 ],
1755 }], 1768 }],
1756 ], 1769 ],
1757 } 1770 }
OLDNEW
« no previous file with comments | « media/formats/webm/chromeos/webm_encoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698