diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 22:05:49 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 22:05:49 +0000 |
| commit | a5f64474e464e0e062a31db37cf67ef7114bafe2 (patch) | |
| tree | 93c02adef5c03b0015cd82354c156ecb2d0474ce /third_party | |
| parent | 75c60c1aa64a03889641bfc0fdbace7f440097b9 (diff) | |
| download | chromium_src-a5f64474e464e0e062a31db37cf67ef7114bafe2.zip chromium_src-a5f64474e464e0e062a31db37cf67ef7114bafe2.tar.gz chromium_src-a5f64474e464e0e062a31db37cf67ef7114bafe2.tar.bz2 | |
Gyp change to allow overriding of the binaries used based on environment variables.
BUG=16779
TEST=none
Review URL: http://codereview.chromium.org/172060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 9f99cc1..49aa5cf 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -14,6 +14,10 @@ ], }, 'variables': { + # Allow overridding the selection of which ffmpeg binaries to copy via an + # environment variable. Affects the ffmpeg_binaries target. + 'ffmpeg_branding%': '<(branding)', + 'use_system_ffmpeg%': 0, }, 'targets': [ @@ -180,9 +184,9 @@ 'msvs_guid': '4E4070E1-EFD9-4EF1-8634-3960956F6F10', 'variables': { 'conditions': [ - [ 'branding=="Chrome"', { + [ 'ffmpeg_branding=="Chrome"', { 'branding_dir': 'chrome', - }, { # else branding!="Chrome" + }, { # else ffmpeg_branding!="Chrome" 'branding_dir': 'chromium', }], ], |