summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 01:11:47 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 01:11:47 +0000
commit36f3fe75af009899aa385a68d03229233a23b3ea (patch)
tree714830e25a64ca5a53b8f22fbc90860eb918f97f
parent44a7e0c250e1c8cfbfe80e2e78ff18d150184c0b (diff)
downloadchromium_src-36f3fe75af009899aa385a68d03229233a23b3ea.zip
chromium_src-36f3fe75af009899aa385a68d03229233a23b3ea.tar.gz
chromium_src-36f3fe75af009899aa385a68d03229233a23b3ea.tar.bz2
Remove NPAPI target from flash_player.gyp
BUG=161893 Review URL: https://chromiumcodereview.appspot.com/11308255 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173031 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp1
-rw-r--r--third_party/adobe/flash/flash_player.gyp15
2 files changed, 0 insertions, 16 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 8709057..181ab4a 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -618,7 +618,6 @@
'../courgette/courgette.gyp:courgette64',
'../cloud_print/cloud_print.gyp:cloud_print',
'../remoting/remoting.gyp:remoting_webapp',
- '../third_party/adobe/flash/flash_player.gyp:flash_player',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin',
],
'conditions': [
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index 7a18e66..ea6ddb0 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -45,21 +45,6 @@
# anything to be done in this file (instead of a higher-level .gyp file).
'targets': [
{
- # TODO(shess): Remove this target entirely.
- 'target_name': 'flash_player',
- 'type': 'none',
- 'conditions': [
- [ 'branding == "Chrome"', {
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)',
- 'files': [],
- 'conditions': [
- ],
- }],
- }],
- ],
- },
- {
'target_name': 'flapper_version_h',
'type': 'none',
'copies': [{