Exclude content/plugin/ when plugins are disabled.

content/content_plugin.gypi

Index: content/content_plugin.gypi
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index cab0b488d282b6546b0e6e9674940013e2b26476..27dd243fab6974c892ff2c1b23a6847d8fece603 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -3,63 +3,67 @@
 # found in the LICENSE file.
 
 {
-  'dependencies': [
-    '../skia/skia.gyp:skia',
-    '../third_party/npapi/npapi.gyp:npapi',
-    '../webkit/support/webkit_support.gyp:glue',
-  ],
-  'include_dirs': [
-    '<(INTERMEDIATE_DIR)',
-  ],
-  'sources': [
-    # All .cc, .h, .m, and .mm files under plugins except for tests and
-    # mocks.
-    'plugin/plugin_channel.cc',
-    'plugin/plugin_channel.h',
-    'plugin/plugin_interpose_util_mac.mm',
-    'plugin/plugin_interpose_util_mac.h',
-    'plugin/plugin_main.cc',
-    'plugin/plugin_main_linux.cc',
-    'plugin/plugin_main_mac.mm',
-    'plugin/plugin_thread.cc',
-    'plugin/plugin_thread.h',
-    'plugin/webplugin_accelerated_surface_proxy_mac.cc',
-    'plugin/webplugin_accelerated_surface_proxy_mac.h',
-    'plugin/webplugin_delegate_stub.cc',
-    'plugin/webplugin_delegate_stub.h',
-    'plugin/webplugin_proxy.cc',
-    'plugin/webplugin_proxy.h',
-    'public/plugin/content_plugin_client.h',
-  ],
-  # These are layered in conditionals in the event other platforms
-  # end up using this module as well.
   'conditions': [
-    ['os_bsd==1', {
-      'sources/': [
-        ['exclude', '^plugin/plugin_main_linux\\.cc$'],
+    ['enable_plugins==1', {
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../webkit/support/webkit_support.gyp:glue',
       ],
-    }],
-    ['OS=="win"', {
       'include_dirs': [
-        '<(DEPTH)/third_party/wtl/include',
+        '<(INTERMEDIATE_DIR)',
       ],
-    }],
-    ['toolkit_uses_gtk == 1', {
-      'dependencies': [
-        '../build/linux/system.gyp:gtk',
+      'sources': [
+        # All .cc, .h, .m, and .mm files under plugins except for tests and
+        # mocks.
+        'plugin/plugin_channel.cc',
+        'plugin/plugin_channel.h',
+        'plugin/plugin_interpose_util_mac.mm',
+        'plugin/plugin_interpose_util_mac.h',
+        'plugin/plugin_main.cc',
+        'plugin/plugin_main_linux.cc',
+        'plugin/plugin_main_mac.mm',
+        'plugin/plugin_thread.cc',
+        'plugin/plugin_thread.h',
+        'plugin/webplugin_accelerated_surface_proxy_mac.cc',
+        'plugin/webplugin_accelerated_surface_proxy_mac.h',
+        'plugin/webplugin_delegate_stub.cc',
+        'plugin/webplugin_delegate_stub.h',
+        'plugin/webplugin_proxy.cc',
+        'plugin/webplugin_proxy.h',
+        'public/plugin/content_plugin_client.h',
+      ],
+      # These are layered in conditionals in the event other platforms
+      # end up using this module as well.
+      'conditions': [
+        ['os_bsd==1', {
+          'sources/': [
+            ['exclude', '^plugin/plugin_main_linux\\.cc$'],
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lXext',
+            ],
+          },
+        }],
+        ['use_aura==1 and OS!="win"', {
+          'link_settings': {
+            'libraries': [
+              '-lXext',
+            ],
+          },
+        }],
       ],
-      'link_settings': {
-        'libraries': [
-          '-lXext',
-        ],
-      },
-    }],
-    ['use_aura==1 and OS!="win"', {
-      'link_settings': {
-        'libraries': [
-          '-lXext',
-        ],
-      },
     }],
   ],
 }