diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:31:24 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:31:24 +0000 |
| commit | 260efdab7eaf501d046a212dff5534ab8da48aab (patch) | |
| tree | 6e509730eb810ac2aecb3b48afb1d831eb1ee9ff /chrome/chrome_dll.gypi | |
| parent | 76d3bd2e3498bed787816424905fba13a7dc8861 (diff) | |
| download | chromium_src-260efdab7eaf501d046a212dff5534ab8da48aab.zip chromium_src-260efdab7eaf501d046a212dff5534ab8da48aab.tar.gz chromium_src-260efdab7eaf501d046a212dff5534ab8da48aab.tar.bz2 | |
Revert 49991 - Only copy libffmpegsumo if build_libffmpegsumo is 1.
BUG=none
TEST=Build with build_libffmpegsumo=0 in ~/.gyp/include.gypi. Build should give no errors.
Review URL: http://codereview.chromium.org/2839006
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2849009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 44693fe..71863b1e 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -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 |