Chromium Code Reviews

Unified Diff: chrome/chrome_dll.gypi

Issue 2839006: Only copy libffmpegsumo if build_ffmpegsumo is 1. (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 71863b1e217efd6d82064450dbbbb610080e9990..44693fe752a3c23453c12e63802e8cf181a599bf 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -457,15 +457,6 @@
],
},
{
- 'destination':
- '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
- 'files': [
- # TODO(ajwong): Find a way to share this path with
- # ffmpeg.gyp so they don't diverge. (BUG=23602)
- '<(PRODUCT_DIR)/libffmpegsumo.dylib',
- ],
- },
- {
'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
'files': [],
'conditions': [
@@ -532,7 +523,20 @@
'dependencies': [
'../pdf/pdf.gyp:pdf',
],
- }],
+ }], # internal_pdf
+ ['build_ffmpegsumo', {
Mark Mentovai 2010/06/16 18:25:13 Fix CL description: build_ffmpegsumo vs. build_lib
Mark Mentovai 2010/06/16 18:25:13 Where does the default value come from?
Nico 2010/06/16 18:29:43 Too late :-/
Nico 2010/06/16 18:29:43 third_party/ffmpeg/ffmpeg.gyp
Nico 2010/06/16 19:35:19 I used `git try`, but due to http://code.google.co
+ 'copies': [
+ {
+ 'destination':
+ '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+ 'files': [
+ # TODO(ajwong): Find a way to share this path with
+ # ffmpeg.gyp so they don't diverge. (BUG=23602)
+ '<(PRODUCT_DIR)/libffmpegsumo.dylib',
+ ],
+ },
+ ],
+ }], # build_ffmpegsumo
], # conditions
}], # OS=="mac"
], # conditions
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine