Chromium Code Reviews

Unified Diff: chrome/chrome_dll.gypi

Issue 2849009: Revert 49991 - Only copy libffmpegsumo if build_libffmpegsumo is 1.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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
===================================================================
--- chrome/chrome_dll.gypi (revision 49991)
+++ chrome/chrome_dll.gypi (working copy)
@@ -457,6 +457,15 @@
],
},
{
+ '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': [
@@ -523,20 +532,7 @@
'dependencies': [
'../pdf/pdf.gyp:pdf',
],
- }], # internal_pdf
- ['build_ffmpegsumo', {
- '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