diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 19:38:22 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 19:38:22 +0000 |
| commit | 7a336112cdd8eada5a9ed3bba009bba784dee394 (patch) | |
| tree | c6a35597c4fc0b5f78ad2e97ceceed01416b4f68 /third_party | |
| parent | 1d0c39c46778d8738d3c3df702962fc84fce1a57 (diff) | |
| download | chromium_src-7a336112cdd8eada5a9ed3bba009bba784dee394.zip chromium_src-7a336112cdd8eada5a9ed3bba009bba784dee394.tar.gz chromium_src-7a336112cdd8eada5a9ed3bba009bba784dee394.tar.bz2 | |
Add the native control panel for flash 10.3
BUG=74035
TEST=see bug
Review URL: http://codereview.chromium.org/6813099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 111 |
1 files changed, 56 insertions, 55 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index 41735e4..87e4f5f 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -1,55 +1,56 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - # Always provide a target, so we can put the logic about whether there's - # anything to be done in this file (instead of a higher-level .gyp file). - 'targets': [ - { - 'target_name': 'flash_player', - 'type': 'none', - 'conditions': [ - [ 'branding == "Chrome"', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': [], - 'conditions': [ - [ 'chromeos == 1', { - 'files': [ - 'binaries/chromeos/libgcflashplayer.so', - 'binaries/linux/plugin.vch', - ] - }], - [ 'OS == "linux" and target_arch == "ia32" and chromeos == 0', { - 'files': [ - 'binaries/linux/libgcflashplayer.so', - 'binaries/linux/plugin.vch', - ] - }], - [ 'OS == "mac"', { - 'files': [ - 'binaries/mac/Flash Player Plugin for Chrome.plugin', - 'binaries/mac/plugin.vch', - ] - }], - [ 'OS == "win"', { - 'files': [ - 'binaries/win/gcswf32.dll', - 'binaries/win/plugin.vch', - 'symbols/win/gcswf32.pdb', - ] - }], - ], - }], - }], - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: +# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ # Always provide a target, so we can put the logic about whether there's
+ # anything to be done in this file (instead of a higher-level .gyp file).
+ 'targets': [
+ {
+ 'target_name': 'flash_player',
+ 'type': 'none',
+ 'conditions': [
+ [ 'branding == "Chrome"', {
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [],
+ 'conditions': [
+ [ 'chromeos == 1', {
+ 'files': [
+ 'binaries/chromeos/libgcflashplayer.so',
+ 'binaries/linux/plugin.vch',
+ ]
+ }],
+ [ 'OS == "linux" and target_arch == "ia32" and chromeos == 0', {
+ 'files': [
+ 'binaries/linux/libgcflashplayer.so',
+ 'binaries/linux/plugin.vch',
+ ]
+ }],
+ [ 'OS == "mac"', {
+ 'files': [
+ 'binaries/mac/Flash Player Plugin for Chrome.plugin',
+ 'binaries/mac/plugin.vch',
+ ]
+ }],
+ [ 'OS == "win"', {
+ 'files': [
+ 'binaries/win/FlashPlayerCPLApp.cpl',
+ 'binaries/win/gcswf32.dll',
+ 'binaries/win/plugin.vch',
+ 'symbols/win/gcswf32.pdb',
+ ]
+ }],
+ ],
+ }],
+ }],
+ ],
+ },
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
|