diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 22:40:09 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 22:40:09 +0000 |
| commit | 971a537317877cbadb1d33eae42ece104684a935 (patch) | |
| tree | 230706da6f9f38cdb09638fd895fede125515b56 /chrome/chrome_dll.gypi | |
| parent | 0db55771db6bffbb3e08ef89920e2f18502860fa (diff) | |
| download | chromium_src-971a537317877cbadb1d33eae42ece104684a935.zip chromium_src-971a537317877cbadb1d33eae42ece104684a935.tar.gz chromium_src-971a537317877cbadb1d33eae42ece104684a935.tar.bz2 | |
On Mac, move internal plugins to live inside the framework ...
... in particular in a subdirectory called "Internet Plug-Ins".
BUG=46400
TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory
Review URL: http://codereview.chromium.org/2823003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index f892a1f..61465d8 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -284,6 +284,10 @@ # Bring in pdfsqueeze and run it on all pdfs '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', '../build/util/support/support.gyp:*', + # On Mac, Flash gets put into the framework, so we need this + # dependency here. flash_player.gyp will copy the Flash bundle + # into PRODUCT_DIR. + '../third_party/adobe/flash/flash_player.gyp:flash_player', ], 'rules': [ { @@ -461,6 +465,18 @@ '<(PRODUCT_DIR)/libffmpegsumo.dylib', ], }, + { + 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', + 'files': [], + 'conditions': [ + [ 'branding == "Chrome"', { + 'files': [ + '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin', + '<(PRODUCT_DIR)/plugin.vch', + ], + }], + ], + }, ], 'conditions': [ ['mac_breakpad==1', { |