Move webkit/forms/ build into a new webkit_forms.gypi

Most webkit/* directories have their own .gypi file with a static library
building that directories files. This does the same for webkit/forms
instead of the sources being inlined into the glue target.

In addition to be being more like the other directories, this makes it
easy for a build to use a subset of webkit/, which is important for
iOS.

BUG=None


Review URL: https://chromiumcodereview.appspot.com/10897002

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

9 files changed, 51 insertions, 14 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6e0ee5d..f8c50b2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -73,6 +73,7 @@
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:fileapi',
+        '../webkit/support/webkit_support.gyp:forms',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_resources',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index c86afd7..77bf7f6 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -23,6 +23,7 @@
     '../webkit/support/webkit_support.gyp:blob',
     '../webkit/support/webkit_support.gyp:database',
     '../webkit/support/webkit_support.gyp:fileapi',
+    '../webkit/support/webkit_support.gyp:forms',
     '../webkit/support/webkit_support.gyp:webkit_base',
   ],
   'include_dirs': [
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index a726275..e56f872 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -19,6 +19,7 @@
     '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
     '../ui/surface/surface.gyp:surface',
     '../v8/tools/gyp/v8.gyp:v8',
+    '../webkit/support/webkit_support.gyp:forms',
     '../webkit/support/webkit_support.gyp:glue',
     '../webkit/support/webkit_support.gyp:webkit_media',
     '../webkit/support/webkit_support.gyp:webkit_gpu',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fcdd5d4..11a220e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -232,6 +232,7 @@
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:dom_storage',
         '../webkit/support/webkit_support.gyp:fileapi',
+        '../webkit/support/webkit_support.gyp:forms',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_base',
@@ -555,6 +556,7 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
+        '../webkit/support/webkit_support.gyp:forms',
         '../webkit/support/webkit_support.gyp:glue',
       ],
       'include_dirs': [
diff --git a/webkit/forms/webkit_forms.gypi b/webkit/forms/webkit_forms.gypi
new file mode 100644
index 0000000..7d97b28
--- /dev/null
+++ b/webkit/forms/webkit_forms.gypi
@@ -0,0 +1,42 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'forms',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': ['WEBKIT_FORMS_IMPLEMENTATION'],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
+      ],
+      'sources': [
+        'form_data.cc',
+        'form_data.h',
+        'form_data_predictions.cc',
+        'form_data_predictions.h',
+        'form_field.cc',
+        'form_field.h',
+        'form_field_predictions.cc',
+        'form_field_predictions.h',
+        'password_form.cc',
+        'password_form.h',
+        'password_form_dom_manager.cc',
+        'password_form_dom_manager.h',
+        'webkit_forms_export.h',
+      ],
+      'conditions': [
+        ['inside_chromium_build==0', {
+          'dependencies': [
+            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 4488a02..acf1019 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -118,7 +118,6 @@
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_EXTENSIONS_IMPLEMENTATION',
-        'WEBKIT_FORMS_IMPLEMENTATION',
         'WEBKIT_GLUE_IMPLEMENTATION',
         'WEBKIT_PLUGINS_IMPLEMENTATION',
       ],
@@ -146,6 +145,7 @@
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         'blob',
         'fileapi',
+        'forms',
         'webkit_base',
         'webkit_media',
         'webkit_resources',
@@ -160,19 +160,6 @@
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
-        '../forms/form_data.cc',
-        '../forms/form_data.h',
-        '../forms/form_data_predictions.cc',
-        '../forms/form_data_predictions.h',
-        '../forms/form_field.cc',
-        '../forms/form_field.h',
-        '../forms/form_field_predictions.cc',
-        '../forms/form_field_predictions.h',
-        '../forms/password_form.cc',
-        '../forms/password_form.h',
-        '../forms/password_form_dom_manager.cc',
-        '../forms/password_form_dom_manager.h',
-        '../forms/webkit_forms_export.h',
         '../plugins/npapi/carbon_plugin_window_tracker_mac.cc',
         '../plugins/npapi/carbon_plugin_window_tracker_mac.h',
         '../plugins/npapi/gtk_plugin_container.cc',
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index a6d3e3b..8cc1423 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -11,6 +11,7 @@
     '../database/webkit_database.gypi',
     '../dom_storage/webkit_dom_storage.gypi',
     '../fileapi/webkit_fileapi.gypi',
+    '../forms/webkit_forms.gypi',
     '../glue/webkit_glue.gypi',
     '../gpu/webkit_gpu.gypi',
     '../media/webkit_media.gypi',
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 3dbb472..9249f4b 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -23,6 +23,7 @@
         'database',
         'dom_storage',
         'fileapi',
+        'forms',
         'glue',
         'webkit_base',
         'webkit_gpu',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 37847e9..753cf25 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -52,6 +52,7 @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:database',
         '<(DEPTH)/webkit/support/webkit_support.gyp:dom_storage',
         '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:forms',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',