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_exe.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_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 55185b5..a8a714f 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -132,9 +132,6 @@ }, 'dependencies': [ 'chrome_version_info', - # Copy Flash Player files to PRODUCT_DIR if applicable. - # Let the .gyp file decide what to do on a per-OS basis. - '../third_party/adobe/flash/flash_player.gyp:flash_player', ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { @@ -333,14 +330,6 @@ 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Helper.app', ], - 'conditions': [ - [ 'branding == "Chrome"', { - 'files': [ - '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin', - '<(PRODUCT_DIR)/plugin.vch', - ], - }], - ], }, ], 'postbuilds': [ @@ -415,6 +404,10 @@ ], 'dependencies': [ 'packed_extra_resources', + # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp + # file decide what to do on a per-OS basis; on Mac, internal plugins + # go inside the framework, so this dependency is in chrome_dll.gypi. + '../third_party/adobe/flash/flash_player.gyp:flash_player', ], }], ['OS=="mac" or OS=="win"', { |