Add more GN deps to the build.

These deps are some of those required to compile chrome/browser (so mostly those containing resources and protobufs that have generated headers). chrome/browser still has some dependencies left.

Add third_party libs libaddressinput and dom_distiller_js.

Add components dom_distiller and policy.

Separate the generate_library_loader into a separate .gni file.

Rename components_strings to just strings.

R=ajwong@chromium.org

Review URL: https://codereview.chromium.org/362583002

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

12 files changed, 195 insertions, 2 deletions

diff --git a/components/BUILD.gn b/components/BUILD.gn
index 0df3e56..89ae388 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -9,6 +9,7 @@ group("all_components") {
 
   deps = [
     "//components/cloud_devices/common",
+    "//components/dom_distiller/core",
     "//components/favicon_base",
     "//components/json_schema",
     "//components/language_usage_metrics",
@@ -20,7 +21,7 @@ group("all_components") {
     "//components/query_parser",
     "//components/resources:components_resources",
     "//components/startup_metric_utils",
-    "//components/strings:components_strings",
+    "//components/strings",
     "//components/tracing",
     "//components/translate:translate_core_browser",
     "//components/translate:translate_core_common",
diff --git a/components/components_resources.gyp b/components/components_resources.gyp
index 376c9bb..135e84e 100644
--- a/components/components_resources.gyp
+++ b/components/components_resources.gyp
@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/resources
       'target_name': 'components_resources',
       'type': 'none',
       'variables': {
@@ -12,6 +13,7 @@
       },
       'actions': [
         {
+          # GN version: //components/resources:components_resources
           'action_name': 'generate_components_resources',
           'variables': {
             'grit_grd_file': 'resources/components_resources.grd',
@@ -19,6 +21,7 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
+          # GN version: //components/resources:components_scaled_resources
           'action_name': 'generate_components_scaled_resources',
           'variables': {
             'grit_grd_file': 'resources/components_scaled_resources.grd',
diff --git a/components/components_strings.gyp b/components/components_strings.gyp
index facf651..13d12ac 100644
--- a/components/components_strings.gyp
+++ b/components/components_strings.gyp
@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/strings
       'target_name': 'components_strings',
       'type': 'none',
       'variables': {
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index 80e1f4e..5f8c4bb 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -7,6 +7,7 @@
     ['android_webview_build == 0', {
       'targets': [
         {
+          # GN version: //components/dom_distiller/webui
           'target_name': 'dom_distiller_webui',
           'type': 'static_library',
           'dependencies': [
@@ -30,6 +31,7 @@
           ],
         },
         {
+          # GN version: //components/dom_distiller/core
           'target_name': 'dom_distiller_core',
           'type': 'static_library',
           'dependencies': [
@@ -95,6 +97,7 @@
           ],
         },
         {
+          # GN version: components/dom_distiller/core:test_support
           'target_name': 'dom_distiller_test_support',
           'type': 'static_library',
           'dependencies': [
@@ -116,6 +119,7 @@
           ],
         },
         {
+          # GN version: //components/dom_distiller/core/proto
           'target_name': 'distilled_page_proto',
           'type': 'static_library',
           'sources': [
@@ -133,6 +137,7 @@
         ['OS != "ios"', {
           'targets': [
             {
+              # GN version: //components/dom_distiller/content
               'target_name': 'dom_distiller_content',
               'type': 'static_library',
               'dependencies': [
diff --git a/components/dom_distiller/content/BUILD.gn b/components/dom_distiller/content/BUILD.gn
new file mode 100644
index 0000000..b8ef83d
--- /dev/null
+++ b/components/dom_distiller/content/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright 2014 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.
+
+if (!is_ios) {
+  # GYP version: components/dom_distiller.gypi:dom_distiller_content
+  static_library("content") {
+    sources = [
+     "distiller_page_web_contents.cc",
+     "distiller_page_web_contents.h",
+     "dom_distiller_viewer_source.cc",
+     "dom_distiller_viewer_source.h",
+     "web_contents_main_frame_observer.cc",
+     "web_contents_main_frame_observer.h",
+    ]
+
+    deps = [
+      "//components/dom_distiller/core",
+      "//components/resources",
+      "//components/strings",
+      "//content/public/browser",
+      "//net",
+      "//skia",
+     #'../sync/sync.gyp:sync',  TODO(GYP)
+    ]
+  }
+}
diff --git a/components/dom_distiller/core/BUILD.gn b/components/dom_distiller/core/BUILD.gn
new file mode 100644
index 0000000..38ce4fc
--- /dev/null
+++ b/components/dom_distiller/core/BUILD.gn
@@ -0,0 +1,79 @@
+# Copyright 2014 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.
+
+# GYP version: components/dom_distiller.gypi:dom_distiller_core
+static_library("core") {
+  sources = [
+    "../android/component_jni_registrar.cc",
+    "../android/component_jni_registrar.h",
+    "article_distillation_update.cc",
+    "article_distillation_update.h",
+    "article_entry.cc",
+    "article_entry.h",
+    "distilled_content_store.cc",
+    "distilled_content_store.h",
+    "distiller.cc",
+    "distiller.h",
+    "distiller_page.cc",
+    "distiller_page.h",
+    "distiller_url_fetcher.cc",
+    "distiller_url_fetcher.h",
+    "dom_distiller_constants.cc",
+    "dom_distiller_constants.h",
+    "dom_distiller_model.cc",
+    "dom_distiller_model.h",
+    "dom_distiller_observer.h",
+    "dom_distiller_service.cc",
+    "dom_distiller_service.h",
+    "dom_distiller_store.cc",
+    "dom_distiller_store.h",
+    "feedback_reporter.cc",
+    "feedback_reporter.h",
+    "task_tracker.cc",
+    "task_tracker.h",
+    "url_constants.cc",
+    "url_constants.h",
+    "url_utils_android.cc",
+    "url_utils_android.h",
+    "url_utils.cc",
+    "url_utils.h",
+    "viewer.cc",
+    "viewer.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/dom_distiller/core/proto",
+    "//components/resources",
+    "//components/strings",
+    "//skia",
+    "//sync",
+    "//third_party/dom_distiller_js/package/proto",
+    #'components.gyp:leveldb_proto',  TODO(GYP)
+  ]
+
+  if (is_android) {
+    #deps += [ ":dom_distiller_core_jni_headers" ]  TODO(GYP)
+  }
+}
+
+# GYP version: components/dom_distiller.gypi:dom_distiller_test_support
+static_library("test_support") {
+  sources = [
+    "dom_distiller_test_util.cc",
+    "dom_distiller_test_util.h",
+    "fake_distiller.cc",
+    "fake_distiller.h",
+    "fake_distiller_page.cc",
+    "fake_distiller_page.h",
+  ]
+
+  deps = [
+    ":core",
+    #'components.gyp:leveldb_proto_test_support',  TODO(GYP)
+    "//sync",
+    "//testing/gmock",
+  ]
+}
+
diff --git a/components/dom_distiller/core/proto/BUILD.gn b/components/dom_distiller/core/proto/BUILD.gn
new file mode 100644
index 0000000..a061eaf
--- /dev/null
+++ b/components/dom_distiller/core/proto/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2014 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.
+
+import("//third_party/protobuf/proto_library.gni")
+
+# GYP version: components/dom_distiller.gypi:distilled_page_proto
+proto_library("proto") {
+  sources = [
+    "distilled_article.proto",
+    "distilled_page.proto",
+  ]
+}
diff --git a/components/dom_distiller/webui/BUILD.gn b/components/dom_distiller/webui/BUILD.gn
new file mode 100644
index 0000000..2272840
--- /dev/null
+++ b/components/dom_distiller/webui/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2014 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.
+
+# GYP version: components/dom_distiller.gyp:dom_distiller_webui
+static_library("webui") {
+  sources = [
+    "dom_distiller_handler.cc",
+    "dom_distiller_handler.h",
+    "dom_distiller_ui.cc",
+    "dom_distiller_ui.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/dom_distiller/core",
+    "//components/dom_distiller/core/proto",
+    "//components/resources",
+    "//components/strings",
+    "//content/public/browser",
+    "//skia",
+    #'../sync/sync.gyp:sync',  TODO(GYP)
+  ]
+}
diff --git a/components/policy.gypi b/components/policy.gypi
index d99f7af..b5dc32c 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -198,6 +198,7 @@
           ],
         },
         {
+          # GN version: //components/policy/proto
           'target_name': 'cloud_policy_proto',
           'type': '<(component)',
           'sources': [
diff --git a/components/policy/proto/BUILD.gn b/components/policy/proto/BUILD.gn
new file mode 100644
index 0000000..13b7e2f
--- /dev/null
+++ b/components/policy/proto/BUILD.gn
@@ -0,0 +1,22 @@
+# Copyright 2014 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.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("proto") {
+  sources = [
+    "device_management_backend.proto",
+    "policy_signing_key.proto",
+  ]
+  if (!is_android && !is_ios) {
+    sources += [ "chrome_extension_policy.proto" ]
+  }
+  if (is_chromeos) {
+    sources += [ "device_management_local.proto" ]
+  }
+
+  cc_generator_options = "dllexport_decl=POLICY_PROTO_EXPORT:"
+  cc_include = "components/policy/policy_proto_export.h"
+  defines = [ "POLICY_PROTO_COMPILATION" ]
+}
diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn
index 2208865..5c27e28 100644
--- a/components/resources/BUILD.gn
+++ b/components/resources/BUILD.gn
@@ -4,6 +4,22 @@
 
 import("//tools/grit/grit_rule.gni")
 
+# GYP version: components/components_resources.gyp:components_resources
+group("resources") {
+  deps = [
+    ":components_resources",
+    ":components_scaled_resources",
+  ]
+}
+
+# GYP version: components/components_resources.gyp
+#              (generate_components_resources action)
 grit("components_resources") {
   source = "components_resources.grd"
 }
+
+# GYP version: components/components_resources.gyp
+#              (generate_scaled_components_resources action)
+grit("components_scaled_resources") {
+  source = "components_scaled_resources.grd"
+}
diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn
index 192b4f1..e6287a5 100644
--- a/components/strings/BUILD.gn
+++ b/components/strings/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//tools/grit/grit_rule.gni")
 
-grit("components_strings") {
+# GYP version: components/components_strings.gyp:components_strings
+grit("strings") {
   source = "../components_strings.grd"
 }