Add build_webkit_exes_from_webkit_gyp flag to build/common.gypi

This is the first step in splitting up the circular dependencies between
DRT, webkit_support, and webkit. This change should be a no-op for now.

R=tony@chromium.org
BUG=https://bugs.webkit.org/show_bug.cgi?id=68463

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

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

build/common.gypi

@@ -612,6 +612,12 @@
     # The Java Bridge is not compiled in by default.
     'java_bridge%': 0,
 
+    # TODO(dpranke): This determines whether we should attempt to build DRT
+    # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This
+    # flag should only be needed temporarily. See
+    # https://bugs.webkit.org/show_bug.cgi?id=68463.
+    'build_webkit_exes_from_webkit_gyp%': 1,
+
     'conditions': [
       # Used to disable Native Client at compile time, for platforms where it
       # isn't supported (ARM)

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
 }