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

Side by Side Diff: media/media.gyp

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 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
« 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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 'MEDIA_DISABLE_FFMPEG', 675 'MEDIA_DISABLE_FFMPEG',
676 ], 676 ],
677 'direct_dependent_settings': { 677 'direct_dependent_settings': {
678 'defines': [ 678 'defines': [
679 'MEDIA_DISABLE_FFMPEG', 679 'MEDIA_DISABLE_FFMPEG',
680 ], 680 ],
681 }, 681 },
682 }], 682 }],
683 ['media_use_libvpx==1', { 683 ['media_use_libvpx==1', {
684 'dependencies': [ 684 'dependencies': [
685 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 685 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new',
686 ], 686 ],
687 }, { # media_use_libvpx==0 687 }, { # media_use_libvpx==0
688 'defines': [ 688 'defines': [
689 'MEDIA_DISABLE_LIBVPX', 689 'MEDIA_DISABLE_LIBVPX',
690 ], 690 ],
691 'direct_dependent_settings': { 691 'direct_dependent_settings': {
692 'defines': [ 692 'defines': [
693 'MEDIA_DISABLE_LIBVPX', 693 'MEDIA_DISABLE_LIBVPX',
694 ], 694 ],
695 }, 695 },
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
2076 'dependencies': [ 2076 'dependencies': [
2077 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2077 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2078 ], 2078 ],
2079 }], 2079 }],
2080 ], 2080 ],
2081 }, 2081 },
2082 ], 2082 ],
2083 }], 2083 }],
2084 ], 2084 ],
2085 } 2085 }
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