Upstreaming WebKit.gyp

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8affdb2f29bda73c69f00232af16ce163d016fa4..e6c4a82dc41f3d64187b5edc87e780d815eeb2f6 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -31,7 +31,7 @@
       'profile_import',
       'worker',
       '../printing/printing.gyp:printing',
-      '../webkit/webkit.gyp:inspector_resources',
+      '../webkit/webkit_glue.gyp:inspector_resources',
     ],
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
@@ -524,8 +524,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/webkit_glue.gyp:appcache',
+        '../webkit/webkit_glue.gyp:glue',
       ],
       'include_dirs': [
         '..',
@@ -791,8 +791,8 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit.gyp:database',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/webkit_glue.gyp:database',
+        '../webkit/webkit_glue.gyp:glue',
       ],
       'include_dirs': [
         '..',
@@ -3164,7 +3164,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/webkit_glue.gyp:glue',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -3216,7 +3216,7 @@
         'chrome_resources',
         'chrome_strings',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit.gyp:glue',
+        '../webkit/webkit_glue.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',
@@ -3267,9 +3267,11 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
+        # TODO(yaar): Should only stop depending on webcore and depend 
+        # only on webkit.
         '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        '../webkit/webkit.gyp:glue',
-        '../webkit/api/WebKit.gyp:webkit',
+        '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+        '../webkit/webkit_glue.gyp:glue',
       ],
       'include_dirs': [
         '..',
@@ -3465,7 +3467,7 @@
       'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
       'dependencies': [
         '../base/base.gyp:base',
-        '../webkit/api/WebKit.gyp:webkit',
+        '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'sources': [
         'worker/nativewebworker_impl.cc',
@@ -4466,8 +4468,7 @@
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
-        '../webkit/api/WebKit.gyp:webkit',
-        '../webkit/webkit.gyp:webkit_resources',
+        '../webkit/webkit_glue.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -4476,6 +4477,7 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
+        '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
@@ -5628,7 +5630,7 @@
                 '../build/util/support/support.gyp:*',
                 '../third_party/cld/cld.gyp:cld',
                 '../views/views.gyp:views',
-                '../webkit/webkit.gyp:webkit_resources',
+                '../webkit/webkit_glue.gyp:webkit_resources',
                 '../gears/gears.gyp:gears',
               ],
               'defines': [
@@ -6322,7 +6324,7 @@
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../webkit/webkit.gyp:glue',
+            '../webkit/webkit_glue.gyp:glue',
           ],
           'sources': [
             'browser/safe_browsing/database_perftest.cc',
@@ -6525,7 +6527,7 @@
             '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
             '../webkit/tools/test_shell/test_shell.gyp:*',
-            '../webkit/webkit.gyp:*',
+            '../webkit/webkit_glue.gyp:*',
 
             '../build/temp_gyp/googleurl.gyp:*',
 
@@ -6645,13 +6647,13 @@
               'syncapi',
               'test_support_unit',
               '../printing/printing.gyp:printing',
-              '../webkit/api/WebKit.gyp:webkit',
               '../skia/skia.gyp:skia',
               '../testing/gtest.gyp:gtest',
               '../third_party/icu/icu.gyp:icui18n',
               '../third_party/icu/icu.gyp:icuuc',
               '../third_party/libxml/libxml.gyp:libxml',
               '../third_party/npapi/npapi.gyp:npapi',
+              '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
             ],
             'include_dirs': [
               '..',