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

Side by Side Diff: media/media.gyp

Issue 1734613003: Move libvpx_new to libvpx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 | « media/filters/vpx_video_decoder.cc ('k') | media/media_cdm.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 '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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 'MEDIA_DISABLE_FFMPEG', 657 'MEDIA_DISABLE_FFMPEG',
658 ], 658 ],
659 'direct_dependent_settings': { 659 'direct_dependent_settings': {
660 'defines': [ 660 'defines': [
661 'MEDIA_DISABLE_FFMPEG', 661 'MEDIA_DISABLE_FFMPEG',
662 ], 662 ],
663 }, 663 },
664 }], 664 }],
665 ['media_use_libvpx==1', { 665 ['media_use_libvpx==1', {
666 'dependencies': [ 666 'dependencies': [
667 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', 667 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
668 ], 668 ],
669 }, { # media_use_libvpx==0 669 }, { # media_use_libvpx==0
670 'defines': [ 670 'defines': [
671 'MEDIA_DISABLE_LIBVPX', 671 'MEDIA_DISABLE_LIBVPX',
672 ], 672 ],
673 'direct_dependent_settings': { 673 'direct_dependent_settings': {
674 'defines': [ 674 'defines': [
675 'MEDIA_DISABLE_LIBVPX', 675 'MEDIA_DISABLE_LIBVPX',
676 ], 676 ],
677 }, 677 },
(...skipping 1426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2104 'dependencies': [ 2104 'dependencies': [
2105 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2105 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2106 ], 2106 ],
2107 }], 2107 }],
2108 ], 2108 ],
2109 }, 2109 },
2110 ], 2110 ],
2111 }], 2111 }],
2112 ], 2112 ],
2113 } 2113 }
OLDNEW
« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | media/media_cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698