Add build_webkit_exes_from_webkit_gyp flag to build/common.gypi

webkit/webkit.gyp

Index: webkit/webkit.gyp
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index d696016c0f0382d230248662585a7b333beb8f45..81dd6b86a1b8eab6ff643a4b7230ef5f629cd369 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -11,20 +11,43 @@
   'variables': {
     'chromium_code': 1,
   },
-  'targets': [
-    {
-      'target_name': 'pull_in_webkit_unit_tests',
-      'type': 'none',
-      'dependencies': [
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit_tests'
+  'conditions': [
+    # TODO(dpranke): See https://bugs.webkit.org/show_bug.cgi?id=68463 , 
+    # flag in build/common.gypi.
+    ['build_webkit_exes_from_webkit_gyp==1', {
+      'targets': [
+        {
+          'target_name': 'pull_in_webkit_unit_tests',
+          'type': 'none',
+          'dependencies': [
+            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit_tests'
+          ],
+        },
+        {
+          'target_name': 'pull_in_DumpRenderTree',
+          'type': 'none',
+          'dependencies': [
+            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree'
+          ],
+        }
       ],
-    },
-    {
-      'target_name': 'pull_in_DumpRenderTree',
-      'type': 'none',
-      'dependencies': [
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree'
+    }, {
+      'targets': [
+        {
+          'target_name': 'pull_in_webkit_unit_tests',
+          'type': 'none',
+          'dependencies': [
+            '../third_party/WebKit/Source/WebKit/chromium/WebKitTest.gyp:webkit_unit_tests'
+          ],
+        },
+        {
+          'target_name': 'pull_in_DumpRenderTree',
+          'type': 'none',
+          'dependencies': [
+            '../third_party/WebKit/Tools/Tools.gyp:DumpRenderTree'
+          ],
+        }
       ],
-    },
+    }]
   ], # targets
 }