summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-09 21:10:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-09 21:10:25 +0000
commit273ae5ab4a7e4f40748bdb6d35487dea71f6c22d (patch)
treea3f390b1eb6f4a96d3cc5bec9b6ae94759335cab
parent49a1a989fcd17a79789c37cbc75b8e87845b85e4 (diff)
downloadchromium_src-273ae5ab4a7e4f40748bdb6d35487dea71f6c22d.zip
chromium_src-273ae5ab4a7e4f40748bdb6d35487dea71f6c22d.tar.gz
chromium_src-273ae5ab4a7e4f40748bdb6d35487dea71f6c22d.tar.bz2
Add more components to GN build.
domain_reliability favicon history url_fixer R=jamesr@chromium.org Review URL: https://codereview.chromium.org/377393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282120 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/BUILD.gn12
-rw-r--r--components/BUILD.gn12
-rw-r--r--components/domain_reliability.gypi2
-rw-r--r--components/domain_reliability/BUILD.gn62
-rw-r--r--components/favicon.gypi2
-rw-r--r--components/favicon/core/BUILD.gn18
-rw-r--r--components/history.gypi6
-rw-r--r--components/history/core/browser/BUILD.gn29
-rw-r--r--components/history/core/common/BUILD.gn14
-rw-r--r--components/history/core/test/BUILD.gn16
-rw-r--r--components/url_fixer.gypi2
-rw-r--r--components/url_fixer/BUILD.gn20
12 files changed, 189 insertions, 6 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 48f1ce1..187af57 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -42,6 +42,11 @@ static_library("browser") {
"//chrome/common/net",
"//components/autofill/core/browser",
"//components/cloud_devices/common",
+ "//components/domain_reliability",
+ "//components/favicon_base",
+ "//components/favicon/core",
+ "//components/history/core/browser",
+ "//components/history/core/common",
"//components/metrics:net",
"//components/navigation_metrics",
"//components/os_crypt",
@@ -50,6 +55,7 @@ static_library("browser") {
"//components/strings",
"//components/translate:translate_core_browser",
"//components/translate:translate_core_common",
+ "//components/url_fixer",
"//components/user_prefs",
"//content/public/browser",
"//content/public/common",
@@ -78,14 +84,9 @@ static_library("browser") {
#"../components/components.gyp:bookmarks_browser",
#"../components/components.gyp:captive_portal",
#"../components/components.gyp:data_reduction_proxy_browser",
- #"../components/components.gyp:domain_reliability",
- #"../components/components.gyp:favicon_base",
- #"../components/components.gyp:favicon_core",
#"../components/components.gyp:feedback_component",
#"../components/components.gyp:gcm_driver",
#"../components/components.gyp:google_core_browser",
- #"../components/components.gyp:history_core_browser",
- #"../components/components.gyp:history_core_common",
#"../components/components.gyp:infobars_core",
#"../components/components.gyp:invalidation",
#"../components/components.gyp:network_time",
@@ -99,7 +100,6 @@ static_library("browser") {
#"../components/components.gyp:signin_core_browser",
#"../components/components.gyp:startup_metric_utils",
#"../components/components.gyp:sync_driver",
- #"../components/components.gyp:url_fixer",
#"../components/components.gyp:webdata_common",
#"../jingle/jingle.gyp:notifier",
#"../third_party/libjingle/libjingle.gyp:libjingle",
diff --git a/components/BUILD.gn b/components/BUILD.gn
index b2b0c5e..56ae457 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -13,7 +13,12 @@ group("all_components") {
"//components/autofill/content/renderer",
"//components/cloud_devices/common",
"//components/dom_distiller/core",
+ "//components/domain_reliability",
"//components/favicon_base",
+ "//components/favicon/core",
+ "//components/history/core/browser",
+ "//components/history/core/common",
+ "//components/history/core/test",
"//components/json_schema",
"//components/language_usage_metrics",
"//components/metrics",
@@ -29,6 +34,7 @@ group("all_components") {
"//components/tracing",
"//components/translate:translate_core_browser",
"//components/translate:translate_core_common",
+ "//components/url_fixer",
"//components/url_matcher",
"//components/user_prefs",
"//components/variations",
@@ -54,6 +60,12 @@ group("all_components") {
"//components/autofill/content/renderer", # Blocked on content/blink.
"//components/cloud_devices/common", # Should work, needs checking.
"//components/dom_distiller/core", # Blocked on content.
+ "//components/domain_reliability", # Blocked on content.
+ "//components/favicon_base", # Should work, needs checking.
+ "//components/favicon/core", # Blocked on keyed service.
+ "//components/history/core/browser", # Should work, needs checking.
+ "//components/history/core/common", # Should work, needs checking.
+ "//components/history/core/test", # Should work, needs checking.
"//components/json_schema", # Should work, needs checking.
"//components/keyed_service/content", # Blocked on content.
"//components/policy", # Blocked on content (indirectly via autofill).
diff --git a/components/domain_reliability.gypi b/components/domain_reliability.gypi
index 50412d5..75583b1 100644
--- a/components/domain_reliability.gypi
+++ b/components/domain_reliability.gypi
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //components/domain_reliability
'target_name': 'domain_reliability',
'type': '<(component)',
'dependencies': [
@@ -21,6 +22,7 @@
'DOMAIN_RELIABILITY_IMPLEMENTATION',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'domain_reliability/baked_in_configs.h',
'domain_reliability/beacon.cc',
'domain_reliability/beacon.h',
diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn
new file mode 100644
index 0000000..528d5d4
--- /dev/null
+++ b/components/domain_reliability/BUILD.gn
@@ -0,0 +1,62 @@
+# 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.
+
+action("bake_in_configs") {
+ visibility = ":*"
+ script = "bake_in_configs.py"
+
+ inputs = [
+ "baked_in_configs/apis_google_com.json",
+ "baked_in_configs/ddm_google_com.json",
+ "baked_in_configs/drive_google_com.json",
+ "baked_in_configs/mail_google_com.json",
+ "baked_in_configs/ssl_gstatic_com.json",
+ "baked_in_configs/www_google_com.json",
+ "baked_in_configs/www_youtube_com.json",
+ ]
+ outputs = [
+ "$target_gen_dir/baked_in_configs.cc",
+ ]
+
+ args = rebase_path(inputs, root_build_dir) +
+ rebase_path(outputs, root_build_dir)
+}
+
+component("domain_reliability") {
+ sources = [
+ "baked_in_configs.h",
+ "beacon.cc",
+ "beacon.h",
+ "clear_mode.h",
+ "config.cc",
+ "config.h",
+ "context.cc",
+ "context.h",
+ "dispatcher.cc",
+ "dispatcher.h",
+ "domain_reliability_export.h",
+ "monitor.cc",
+ "monitor.h",
+ "scheduler.cc",
+ "scheduler.h",
+ "service.cc",
+ "service.h",
+ "uploader.cc",
+ "uploader.h",
+ "util.cc",
+ "util.h",
+ ]
+ sources += get_target_outputs(":bake_in_configs")
+
+ defines = [ "DOMAIN_RELIABILITY_IMPLEMENTATION" ]
+
+ deps = [
+ ":bake_in_configs",
+ "//base",
+ "//components/keyed_service/core",
+ "//content/public/browser",
+ "//net",
+ "//url",
+ ]
+}
diff --git a/components/favicon.gypi b/components/favicon.gypi
index 32b6455..262bd2b4 100644
--- a/components/favicon.gypi
+++ b/components/favicon.gypi
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //components/favicon/core
'target_name': 'favicon_core',
'type': 'static_library',
'dependencies': [
@@ -13,6 +14,7 @@
'keyed_service_core',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'favicon/core/browser/favicon_client.h',
'favicon/core/favicon_driver.h',
'favicon/core/favicon_url.cc',
diff --git a/components/favicon/core/BUILD.gn b/components/favicon/core/BUILD.gn
new file mode 100644
index 0000000..0f834cb
--- /dev/null
+++ b/components/favicon/core/BUILD.gn
@@ -0,0 +1,18 @@
+# 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.
+
+static_library("core") {
+ sources = [
+ "browser/favicon_client.h",
+ "favicon_driver.h",
+ "favicon_url.cc",
+ "favicon_url.h",
+ ]
+
+ deps = [
+ "//components/favicon_base",
+ "//components/keyed_service/core",
+ "//ui/gfx/geometry",
+ ]
+}
diff --git a/components/history.gypi b/components/history.gypi
index f62e19a..63dae2e 100644
--- a/components/history.gypi
+++ b/components/history.gypi
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //components/history/core/browser
'target_name': 'history_core_browser',
'type': 'static_library',
'include_dirs': [
@@ -19,6 +20,7 @@
'query_parser',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'history/core/browser/history_client.cc',
'history/core/browser/history_client.h',
'history/core/browser/history_match.cc',
@@ -35,6 +37,7 @@
],
},
{
+ # GN version: //components/history/core/common
'target_name': 'history_core_common',
'type': 'static_library',
'include_dirs': [
@@ -44,11 +47,13 @@
'../base/base.gyp:base',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'history/core/common/thumbnail_score.cc',
'history/core/common/thumbnail_score.h',
],
},
{
+ # GN version: //components/history/core/test
'target_name': 'history_core_test_support',
'type': 'static_library',
'include_dirs': [
@@ -60,6 +65,7 @@
'../url/url.gyp:url_lib',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'history/core/test/history_client_fake_bookmarks.cc',
'history/core/test/history_client_fake_bookmarks.h',
],
diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn
new file mode 100644
index 0000000..bbf27e0
--- /dev/null
+++ b/components/history/core/browser/BUILD.gn
@@ -0,0 +1,29 @@
+# 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.
+
+static_library("browser") {
+ sources = [
+ "history_client.cc",
+ "history_client.h",
+ "history_match.cc",
+ "history_match.h",
+ "in_memory_database.cc",
+ "in_memory_database.h",
+ "keyword_id.h",
+ "keyword_search_term.cc",
+ "keyword_search_term.h",
+ "url_database.cc",
+ "url_database.h",
+ "url_row.cc",
+ "url_row.h",
+ ]
+
+ deps = [
+ "//base",
+ "//components/keyed_service/core",
+ "//components/query_parser",
+ "//net",
+ "//sql",
+ ]
+}
diff --git a/components/history/core/common/BUILD.gn b/components/history/core/common/BUILD.gn
new file mode 100644
index 0000000..7a49314
--- /dev/null
+++ b/components/history/core/common/BUILD.gn
@@ -0,0 +1,14 @@
+# 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.
+
+static_library("common") {
+ sources = [
+ "thumbnail_score.cc",
+ "thumbnail_score.h",
+ ]
+
+ deps = [
+ "//base",
+ ]
+}
diff --git a/components/history/core/test/BUILD.gn b/components/history/core/test/BUILD.gn
new file mode 100644
index 0000000..7ac0c01
--- /dev/null
+++ b/components/history/core/test/BUILD.gn
@@ -0,0 +1,16 @@
+# 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.
+
+static_library("test") {
+ sources = [
+ "history_client_fake_bookmarks.cc",
+ "history_client_fake_bookmarks.h",
+ ]
+
+ deps = [
+ "//base",
+ "//components/history/core/browser",
+ "//url",
+ ]
+}
diff --git a/components/url_fixer.gypi b/components/url_fixer.gypi
index 5870a1e..917e9d7 100644
--- a/components/url_fixer.gypi
+++ b/components/url_fixer.gypi
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //components/url_fixer
'target_name': 'url_fixer',
'type': 'static_library',
'include_dirs': [
@@ -15,6 +16,7 @@
'../net/net.gyp:net',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'url_fixer/url_fixer.cc',
'url_fixer/url_fixer.h',
],
diff --git a/components/url_fixer/BUILD.gn b/components/url_fixer/BUILD.gn
new file mode 100644
index 0000000..bf29f35
--- /dev/null
+++ b/components/url_fixer/BUILD.gn
@@ -0,0 +1,20 @@
+# 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.
+
+static_library("url_fixer") {
+ sources = [
+ "url_fixer.cc",
+ "url_fixer.h",
+ ]
+
+ deps = [
+ "//base",
+ "//net",
+ ]
+
+ if (is_win) {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ cflags = [ "/wd4267" ]
+ }
+}