diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
| commit | e0d0014eb45448bf6bc59d905707d242f7517ba6 (patch) | |
| tree | 1030df65cda3e16b32a2aa1efcf688f95d89e3e6 /chrome | |
| parent | d8aea60122ca0a50a63de1bc3ab9673086c0e59d (diff) | |
| download | chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.zip chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.gz chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.bz2 | |
Update ffmpeg binaries directories to support variants based off the target architecture.
BUG=20948
TEST=none
Review URL: http://codereview.chromium.org/215016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 15 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 8 |
2 files changed, 9 insertions, 14 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 09d1e70..1ac3e76 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3241,10 +3241,13 @@ 'copies': [ { 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS', + # TODO(ajwong): This, and the parallel chromium stanza below + # really should find a way to share file paths with + # ffmpeg.gyp so they don't diverge. 'files': [ - '../third_party/ffmpeg/binaries/chrome/libavcodec.52.dylib', - '../third_party/ffmpeg/binaries/chrome/libavformat.52.dylib', - '../third_party/ffmpeg/binaries/chrome/libavutil.50.dylib', + '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavcodec.52.dylib', + '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavformat.52.dylib', + '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavutil.50.dylib', ], }, ], @@ -3257,9 +3260,9 @@ { 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS', 'files': [ - '../third_party/ffmpeg/binaries/chromium/libavcodec.52.dylib', - '../third_party/ffmpeg/binaries/chromium/libavformat.52.dylib', - '../third_party/ffmpeg/binaries/chromium/libavutil.50.dylib', + '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavcodec.52.dylib', + '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavformat.52.dylib', + '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavutil.50.dylib', ], }, ], diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 83bf3be..3a3a1db 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -506,14 +506,6 @@ ['target_arch=="x64"', { 'deb_arch': 'amd64', 'rpm_arch': 'x86_64', - # TODO(mmoss) The ffmpeg libs are currently 32-bit only. Once - # we have 64-bit, this will need to copy the correct versions - # to the build output. - 'input_files!': [ - '<(PRODUCT_DIR)/libavcodec.so.52', - '<(PRODUCT_DIR)/libavformat.so.52', - '<(PRODUCT_DIR)/libavutil.so.50', - ], }], ], }, |