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

Unified Diff: chrome/chrome.gyp

Issue 215016: Update ffmpeg binaries directories to support variants based off the target architecture. (Closed)
Patch Set: Fix linux installer. Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 227cd39636f5dbac402efd48ccb4e1bdc2af3bbf..c0847ed40852f538c5bfa5ff8bcbdeb7863e97ba 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3239,10 +3239,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',
],
},
],
@@ -3255,9 +3258,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',
],
},
],
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698