linux: drop my libxul hack; it didn't work

I think I misunderstood nspluginwrapper, and it didn't actually work
on the machine I thought I had tested it on.

Review URL: http://codereview.chromium.org/195075

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26071 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 50 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b959019..bef409d 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2206,10 +2206,6 @@
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../base/base.gyp:linux_versioninfo',
-            # Build placeholder libraries to work around buggy plugins;
-            # see webkit.gyp for details.
-            '../webkit/webkit.gyp:xul',
-            '../webkit/webkit.gyp:xpcom',
           ],
           'sources!': [
             'browser/views/extensions/extension_shelf.cc',
diff --git a/webkit/tools/libxul_hack/libxpcom_hack.cc b/webkit/tools/libxul_hack/libxpcom_hack.cc
deleted file mode 100644
index 65a2aa8..0000000
--- a/webkit/tools/libxul_hack/libxpcom_hack.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2009 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.
-
-// See libxul_hack.cc.  This additional file works around scons not liking
-// multiple targets from the same source.
diff --git a/webkit/tools/libxul_hack/libxul_hack.cc b/webkit/tools/libxul_hack/libxul_hack.cc
deleted file mode 100644
index 600d75a..0000000
--- a/webkit/tools/libxul_hack/libxul_hack.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2009 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.
-
-// Some plugins on older Linuxes depend on libxul.so and libxpcom.so
-// despite not actually requiring any symbols from them.  So we build
-// a fake libxul.so and libxpcom.so and include them in our library
-// path.
-//
-// This source file is therefore empty, and used to build those
-// libraries.
-//
-// This may sound like a terrible hack, but after I thought of it I
-// noticed that nspluginwrapper does the same thing.
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 170e167..37bebde 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1564,30 +1564,4 @@
       ],
     },
   ], # targets
-  'conditions': [
-    ['OS=="linux"', {
-      # See the comments in libxul_hack.cc for a description of why these
-      # libraries exist.
-      'targets': [
-        {
-          # We want to build exactly "libxul.so".
-          'target_name': 'xul',
-          'product_dir': '<(PRODUCT_DIR)',
-          'type': 'loadable_module',
-          'sources': [
-            'tools/libxul_hack/libxul_hack.cc'
-          ],
-        },
-        {
-          # We want to build exactly "libxpcom.so".
-          'target_name': 'xpcom',
-          'product_dir': '<(PRODUCT_DIR)',
-          'type': 'loadable_module',
-          'sources': [
-            'tools/libxul_hack/libxpcom_hack.cc'
-          ],
-        },
-      ], # targets
-    }],
-  ], # conditions
 }