1 files changed, 2 insertions, 17 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 8904f31..464ff85 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -5,6 +5,7 @@
 {
   'includes': [
     '../build/win_precompile.gypi',
+    'tools/test_shell/test_shell.gypi',
   ],
   'variables': {
     'chromium_code': 1,
@@ -24,21 +25,5 @@
         '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree'
       ],
     },
-  ],
-  'conditions': [
-    # Currently test_shell compiles only on Windows, Mac, and Gtk.
-    ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', {
-      'targets': [
-        {
-          # TODO(darin): Delete this dummy target once the build masters stop
-          # trying to build it.
-          'target_name': 'test_shell',
-          'type': 'static_library',
-          'sources': [
-            'support/test_shell_dummy.cc',
-          ],
-        },
-      ],
-    }],
-  ],
+  ], # targets
 }