diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 23:04:44 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 23:04:44 +0000 |
| commit | 9a47855c02f699d96bf514e394df2b5a7f405ade (patch) | |
| tree | 5392b221c8a0f0183239913447ec69499fbcbe98 /chrome/chrome_dll.gypi | |
| parent | 27c145751e36bbe777ecc28d864e248ee0419713 (diff) | |
| download | chromium_src-9a47855c02f699d96bf514e394df2b5a7f405ade.zip chromium_src-9a47855c02f699d96bf514e394df2b5a7f405ade.tar.gz chromium_src-9a47855c02f699d96bf514e394df2b5a7f405ade.tar.bz2 | |
Revert 49738 [problems running tests] - 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
TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/2857001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 61465d8..f892a1f 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -284,10 +284,6 @@ # 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': [ { @@ -465,18 +461,6 @@ '<(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', { |