Make it possible to build DRT in a chromium checkout.

The problem was the circular gyp dependency between webkit.gyp
and WebKit.gyp:
webkit.gyp:pull_in_webkit_unit_tests -> WebKit.gyp -> webkit.gyp:webkit_support.

The fix is to move webkit_support into its own gyp file (like we do
in an webkit only checkout).  We can't use the same gyp file for in-
chromium and in-webkit because we need to change the include path for
features.gypi.  In gyp, variable expansion happens after includes
(otherwise you'd have to expand variables twice and they could change
values), so we can't use a single gyp file for this.

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

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

15 files changed, 53 insertions, 30 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 178d9df..b4d2e78 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -41,6 +41,7 @@
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
+        '../webkit/support/webkit_support_in_chromium.gyp:*',
         '../webkit/webkit.gyp:*',
         'util/build_util.gyp:*',
         'temp_gyp/googleurl.gyp:*',
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index f6ee029..b3c8a9f 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -25,7 +25,7 @@
     'dependencies': [
       '../../chrome.gyp:chrome_strings',
       '../../chrome.gyp:platform_locale_settings',
-      '../../../webkit/webkit.gyp:webkit_strings',
+      '../../../webkit/support/webkit_support_in_chromium.gyp:webkit_strings',
       '../../../app/app.gyp:app_strings',
     ],
     'msvs_settings': {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index df26731..6283e37 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -478,7 +478,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/support/webkit_support_in_chromium.gyp:glue',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -1334,6 +1334,7 @@
             '../third_party/npapi/npapi.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
+            '../webkit/support/webkit_support_in_chromium.gyp:*',
             '../webkit/webkit.gyp:*',
 
             '../build/temp_gyp/googleurl.gyp:*',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2252892..d75b354 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -34,10 +34,10 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit.gyp:appcache',
-        '../webkit/webkit.gyp:database',
-        '../webkit/webkit.gyp:glue',
-        '../webkit/webkit.gyp:webkit_resources',
+        '../webkit/support/webkit_support_in_chromium.gyp:appcache',
+        '../webkit/support/webkit_support_in_chromium.gyp:database',
+        '../webkit/support/webkit_support_in_chromium.gyp:glue',
+        '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 3f45ebe..835c0cb 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -135,8 +135,8 @@
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit.gyp:appcache',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/support/webkit_support_in_chromium.gyp:appcache',
+        '../webkit/support/webkit_support_in_chromium.gyp:glue',
       ],
       'sources': [
         # .cc, .h, and .mm files under chrome/common that are not required for
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 3a28142..1d55f16 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -86,7 +86,7 @@
                 '../build/util/support/support.gyp:*',
                 '../third_party/cld/cld.gyp:cld',
                 '../views/views.gyp:views',
-                '../webkit/webkit.gyp:webkit_resources',
+                '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
                 '../gears/gears.gyp:gears',
               ],
               'sources': [
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 1c2520c..37bde8d 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -22,8 +22,8 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../webkit/webkit.gyp:glue',
-        '../webkit/webkit.gyp:webkit_resources',
+        '../webkit/support/webkit_support_in_chromium.gyp:glue',
+        '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f69922c..fd4521a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -520,7 +520,7 @@
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
-        '../webkit/webkit.gyp:webkit_resources',
+        '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -2060,7 +2060,7 @@
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../webkit/webkit.gyp:glue',
+            '../webkit/support/webkit_support_in_chromium.gyp:glue',
           ],
           'sources': [
             'browser/privacy_blacklist/blacklist_perftest.cc',
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index b8b932d..2d73a123 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -69,7 +69,7 @@
         'chrome_strings',
         'common',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/support/webkit_support_in_chromium.gyp:glue',
         '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome',
         '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
         '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate',
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index f003402..1a06415 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -21,7 +21,7 @@
     '<(DEPTH)/testing/gtest.gyp:gtest',
     '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
     # run time dependency
-    '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
+    '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
   ],
   'include_dirs': [
     '<(DEPTH)',
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 0ceaa4b..999f539 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -17,8 +17,8 @@
             '../../third_party/icu/icu.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/npapi/npapi.gyp:npapi',
-            '../webkit.gyp:webkit_resources',
-            '../webkit.gyp:webkit_strings',
+            '../support/webkit_support_in_chromium.gyp:webkit_resources',
+            '../support/webkit_support_in_chromium.gyp:webkit_strings',
           ],
           'include_dirs': [
             '../..',
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index be19855..5b59e76 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -3,7 +3,10 @@
 # found in the LICENSE file.
 
 {
-  # Suppose this file is put at WebKit/WebKit/chromium/webkit/support/.
+  # This file is the same as webkit_support_in_chromium.gyp except it
+  # references features.gypi based on its location in a webkit checkout
+  # (WebKit/Webkit/chromium/webkit/support/).  If you add .gypi files
+  # here, please add them in webkit_support_in_chromium.gyp as well.
   'includes': [
     '../../features.gypi',
     '../appcache/webkit_appcache.gypi',
diff --git a/webkit/support/webkit_support_in_chromium.gyp b/webkit/support/webkit_support_in_chromium.gyp
new file mode 100644
index 0000000..1f435cf
--- /dev/null
+++ b/webkit/support/webkit_support_in_chromium.gyp
@@ -0,0 +1,22 @@
+# Copyright (c) 2010 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.
+
+{
+  # This file is the same as webkit_support.gyp except it references
+  # features.gypi based on its location in a chromium checkout.  If you
+  # add .gypi files here, please add them in webkit_support.gyp as well.
+  'includes': [
+    '../../third_party/WebKit/WebKit/chromium/features.gypi',
+    '../appcache/webkit_appcache.gypi',
+    '../database/webkit_database.gypi',
+    '../glue/webkit_glue.gypi',
+    'webkit_support.gypi',
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index c5a4d84..233d18c 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -37,12 +37,12 @@
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/webkit.gyp:appcache',
-        '<(DEPTH)/webkit/webkit.gyp:database',
-        '<(DEPTH)/webkit/webkit.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:appcache',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:database',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_support',
         '<(DEPTH)/webkit/webkit.gyp:inspector_resources',
-        '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
-        '<(DEPTH)/webkit/webkit.gyp:webkit_support',
         'npapi_layout_test_plugin',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -115,7 +115,7 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/webkit.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
@@ -347,8 +347,8 @@
         }, { # OS != "mac"
           'dependencies': [
             '<(DEPTH)/net/net.gyp:net_resources',
-            '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
-            '<(DEPTH)/webkit/webkit.gyp:webkit_strings',
+            '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+            '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_strings',
           ]
         }],
       ],
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 373073e..5fa7bae 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -7,10 +7,6 @@
     '../third_party/WebKit/WebKit/chromium/features.gypi',
     '../third_party/WebKit/WebKit/chromium/WebKit.gypi',
     '../third_party/WebKit/WebCore/WebCore.gypi',
-    'appcache/webkit_appcache.gypi',
-    'database/webkit_database.gypi',
-    'glue/webkit_glue.gypi',
-    'support/webkit_support.gypi',
     'tools/test_shell/test_shell.gypi',
   ],
   'variables': {