diff options
author | brettw <brettw@chromium.org> | 2015-11-25 18:42:19 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-26 02:44:04 +0000 |
commit | 2629c443088b413164590f782c860e34d0bc663d (patch) | |
tree | ade277140871f54ebcca539341b42248d71d5ba5 | |
parent | 07014b106381da80ddfc478210822a0ae903565b (diff) | |
download | chromium_src-2629c443088b413164590f782c860e34d0bc663d.zip chromium_src-2629c443088b413164590f782c860e34d0bc663d.tar.gz chromium_src-2629c443088b413164590f782c860e34d0bc663d.tar.bz2 |
Make more components pass GN check.
Adds:
gcm_driver
gpu
guest_view
handoff
infobars
invalidation
json_schema
keyed_service
language_usage_metrics
leveldb_proto
login
memory_pressure
message_port
metrics
metrics_services_manager
mime_util
Review URL: https://codereview.chromium.org/1472053004
Cr-Commit-Position: refs/heads/master@{#361804}
-rw-r--r-- | .gn | 35 | ||||
-rw-r--r-- | chrome/common/BUILD.gn | 1 | ||||
-rw-r--r-- | components/gcm_driver/BUILD.gn | 17 | ||||
-rw-r--r-- | components/gcm_driver/crypto/BUILD.gn | 6 | ||||
-rw-r--r-- | components/gcm_driver/instance_id/BUILD.gn | 4 | ||||
-rw-r--r-- | components/guest_view/browser/BUILD.gn | 1 | ||||
-rw-r--r-- | components/guest_view/renderer/BUILD.gn | 7 | ||||
-rw-r--r-- | components/handoff/BUILD.gn | 2 | ||||
-rw-r--r-- | components/infobars/core/BUILD.gn | 1 | ||||
-rw-r--r-- | components/invalidation/impl/BUILD.gn | 50 | ||||
-rw-r--r-- | components/json_schema/BUILD.gn | 1 | ||||
-rw-r--r-- | components/keyed_service/content/BUILD.gn | 3 | ||||
-rw-r--r-- | components/keyed_service/core/BUILD.gn | 2 | ||||
-rw-r--r-- | components/leveldb_proto/BUILD.gn | 4 | ||||
-rw-r--r-- | components/metrics/BUILD.gn | 17 | ||||
-rw-r--r-- | components/metrics_services_manager/BUILD.gn | 1 | ||||
-rw-r--r-- | components/mime_util/BUILD.gn | 1 | ||||
-rw-r--r-- | components/nacl/BUILD.gn | 2 | ||||
-rw-r--r-- | components/nacl/common/BUILD.gn | 11 |
19 files changed, 122 insertions, 44 deletions
@@ -84,28 +84,25 @@ check_targets = [ "//components/filesystem/*", "//components/flags_ui/*", "//components/font_service/*", - - #"//components/gcm_driver/*", + "//components/gcm_driver/*", "//components/google/*", - - #"//components/gpu/*", - #"//components/guest_view/*", - #"//components/handoff/*", + "//components/gpu/*", + "//components/guest_view/*", + "//components/handoff/*", "//components/history/*", "//components/html_viewer/*", - - #"//components/infobars/*", - #"//components/invalidation/*", - #"//components/json_schema/*", - #"//components/keyed_service/*", - #"//components/language_usage_metrics/*", - #"//components/leveldb_proto/*", - #"//components/login/*", - #"//components/memory_pressure/*", - #"//components/message_port/*", - #"//components/metrics/*", - #"//components/metrics_services_manager/*", - #"//components/mime_util/*", + "//components/infobars/*", + "//components/invalidation/*", + "//components/json_schema/*", + "//components/keyed_service/*", + "//components/language_usage_metrics/*", + "//components/leveldb_proto/*", + "//components/login/*", + "//components/memory_pressure/*", + "//components/message_port/*", + "//components/metrics/*", + "//components/metrics_services_manager/*", + "//components/mime_util/*", "//components/mus/*", #"//components/nacl/*", diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index bc89196..0e8b054 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -71,6 +71,7 @@ static_library("common") { "//components/json_schema", "//components/metrics", "//components/metrics:net", + "//components/nacl/common:process_type", "//components/omnibox/common", "//components/policy:policy_component_common", "//components/strings", diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn index 65ea0e4..b8edf26 100644 --- a/components/gcm_driver/BUILD.gn +++ b/components/gcm_driver/BUILD.gn @@ -59,15 +59,22 @@ static_library("gcm_driver") { deps = [ "//base", + "//base:prefs", "//components/gcm_driver/common", + "//components/gcm_driver/crypto", + "//components/keyed_service/core", "//components/os_crypt", + "//components/pref_registry", + "//components/signin/core/browser", "//components/sync_driver", + "//components/version_info", + "//google_apis", "//google_apis/gcm", "//net", "//sync/protocol", "//url:url", - "crypto", ] + allow_circular_includes_from = [ "//components/gcm_driver/crypto" ] if (is_chromeos) { deps += [ "//components/timers" ] @@ -117,6 +124,7 @@ source_set("test_support") { deps = [ "//base", "//google_apis/gcm:test_support", + "//net", "//testing/gtest", ] @@ -141,6 +149,13 @@ source_set("unit_tests") { deps = [ ":gcm_driver", ":test_support", + "//base", + "//base:prefs_test_support", + "//base/test:test_support", + "//google_apis:test_support", + "//google_apis/gcm:test_support", + "//net:test_support", + "//sync/protocol", "//testing/gtest", "//third_party/protobuf:protobuf_lite", ] diff --git a/components/gcm_driver/crypto/BUILD.gn b/components/gcm_driver/crypto/BUILD.gn index d1b7f30..20fb50d 100644 --- a/components/gcm_driver/crypto/BUILD.gn +++ b/components/gcm_driver/crypto/BUILD.gn @@ -25,11 +25,13 @@ source_set("crypto") { deps = [ "//base", + "//components/gcm_driver/common", + "//components/gcm_driver/crypto/proto", "//components/leveldb_proto", "//crypto", "//crypto:platform", + "//net", "//third_party/protobuf:protobuf_lite", - "proto", ] if (use_openssl) { @@ -58,6 +60,8 @@ source_set("unit_tests") { deps = [ ":crypto", "//base", + "//components/gcm_driver/common", + "//crypto", "//crypto:platform", "//testing/gtest", "//third_party/protobuf:protobuf_lite", diff --git a/components/gcm_driver/instance_id/BUILD.gn b/components/gcm_driver/instance_id/BUILD.gn index 4da83de..3e77929 100644 --- a/components/gcm_driver/instance_id/BUILD.gn +++ b/components/gcm_driver/instance_id/BUILD.gn @@ -18,6 +18,7 @@ source_set("instance_id") { "//components/gcm_driver", "//crypto", ] + allow_circular_includes_from = [ "//components/gcm_driver" ] if (is_android) { sources -= [ @@ -41,6 +42,7 @@ source_set("test_support") { deps = [ ":instance_id", + "//base", "//components/gcm_driver:test_support", "//testing/gtest", ] @@ -55,6 +57,8 @@ source_set("unit_tests") { deps = [ ":instance_id", ":test_support", + "//base", + "//google_apis/gcm", "//testing/gtest", ] } diff --git a/components/guest_view/browser/BUILD.gn b/components/guest_view/browser/BUILD.gn index 0aba612..06acfde 100644 --- a/components/guest_view/browser/BUILD.gn +++ b/components/guest_view/browser/BUILD.gn @@ -25,6 +25,7 @@ source_set("browser") { "//components/ui/zoom", "//content/public/browser", "//content/public/common", + "//ipc", "//third_party/WebKit/public:blink", ] } diff --git a/components/guest_view/renderer/BUILD.gn b/components/guest_view/renderer/BUILD.gn index e34a475..aa15cc2 100644 --- a/components/guest_view/renderer/BUILD.gn +++ b/components/guest_view/renderer/BUILD.gn @@ -1,4 +1,8 @@ -static_library("renderer") { +# Copyright 2015 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. + +source_set("renderer") { sources = [ "guest_view_container.cc", "guest_view_container.h", @@ -15,6 +19,7 @@ static_library("renderer") { deps = [ "//base", "//components/guest_view/common", + "//content/public/common", "//content/public/renderer", "//ipc", "//third_party/WebKit/public:blink", diff --git a/components/handoff/BUILD.gn b/components/handoff/BUILD.gn index b48fa74..1eea43c 100644 --- a/components/handoff/BUILD.gn +++ b/components/handoff/BUILD.gn @@ -16,6 +16,8 @@ source_set("handoff") { ] deps = [ "//base", + "//net", + "//url", ] } } diff --git a/components/infobars/core/BUILD.gn b/components/infobars/core/BUILD.gn index d4cb5e1..ed68337 100644 --- a/components/infobars/core/BUILD.gn +++ b/components/infobars/core/BUILD.gn @@ -30,6 +30,7 @@ static_library("core") { "//ui/base", "//ui/gfx", "//ui/strings", + "//url", ] if (use_aura || (!is_ios && !is_android)) { diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn index 3045d67..23cde27 100644 --- a/components/invalidation/impl/BUILD.gn +++ b/components/invalidation/impl/BUILD.gn @@ -1,6 +1,7 @@ # 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_android) { import("//build/config/android/rules.gni") } @@ -31,6 +32,27 @@ source_set("impl") { "unacked_invalidation_set.cc", "unacked_invalidation_set.h", ] + + public_deps = [ + "//components/invalidation/public", + ] + deps = [ + "//base", + "//base:i18n", + "//base:prefs", + "//components/data_use_measurement/core", + "//components/gcm_driver", + "//components/keyed_service/core", + "//components/pref_registry", + "//components/signin/core/browser", + "//google_apis", + "//jingle:notifier", + "//net:net", + + # TODO(sync): Remove this (http://crbug.com/133352); + "//third_party/protobuf:protobuf_lite", + ] + if (!is_android) { sources += [ "gcm_invalidation_bridge.cc", @@ -62,26 +84,8 @@ source_set("impl") { "ticl_settings_provider.cc", "ticl_settings_provider.h", ] + deps += [ "//components/gcm_driver/common" ] } - public_deps = [ - "//components/invalidation/public", - ] - deps = [ - "//base", - "//base:i18n", - "//base:prefs", - "//components/data_use_measurement/core", - "//components/gcm_driver", - "//components/keyed_service/core", - "//components/pref_registry", - "//components/signin/core/browser", - "//google_apis", - "//jingle:notifier", - "//net:net", - - # TODO(sync): Remove this (http://crbug.com/133352); - "//third_party/protobuf:protobuf_lite", - ] if (is_android) { sources += [ @@ -102,6 +106,8 @@ source_set("unit_tests") { deps = [ ":impl", ":test_support", + "//base", + "//base:prefs", "//testing/gmock", "//testing/gtest", ] @@ -129,6 +135,11 @@ source_set("unit_tests") { "ticl_profile_settings_provider_unittest.cc", "unacked_invalidation_set_unittest.cc", ] + deps += [ + "//components/gcm_driver:test_support", + "//components/pref_registry:test_support", + "//google_apis:test_support", + ] } } @@ -166,6 +177,7 @@ static_library("test_support") { "//jingle:notifier", "//net", "//testing/gmock", + "//testing/gtest", # TODO(sync): Remove this (http://crbug.com/133352); "//third_party/protobuf:protobuf_lite", diff --git a/components/json_schema/BUILD.gn b/components/json_schema/BUILD.gn index 4e7b435..0ef0b96 100644 --- a/components/json_schema/BUILD.gn +++ b/components/json_schema/BUILD.gn @@ -25,6 +25,7 @@ source_set("unit_tests") { ] deps = [ ":json_schema", + "//base", "//testing/gtest", ] } diff --git a/components/keyed_service/content/BUILD.gn b/components/keyed_service/content/BUILD.gn index 78d87ff..2cc7eca 100644 --- a/components/keyed_service/content/BUILD.gn +++ b/components/keyed_service/content/BUILD.gn @@ -28,6 +28,9 @@ component("content") { "//base", "//base/third_party/dynamic_annotations", "//components/keyed_service/core", + "//components/pref_registry", + "//components/user_prefs", + "//content/public/browser", "//content/public/common", ] } diff --git a/components/keyed_service/core/BUILD.gn b/components/keyed_service/core/BUILD.gn index 5af2224..3ba7a45 100644 --- a/components/keyed_service/core/BUILD.gn +++ b/components/keyed_service/core/BUILD.gn @@ -32,6 +32,7 @@ component("core") { deps = [ "//base", "//base:prefs", + "//components/pref_registry", "//components/user_prefs", ] } @@ -43,6 +44,7 @@ source_set("unit_tests") { ] deps = [ ":core", + "//base", "//testing/gtest", "//third_party/re2", ] diff --git a/components/leveldb_proto/BUILD.gn b/components/leveldb_proto/BUILD.gn index 03297f9..120f241 100644 --- a/components/leveldb_proto/BUILD.gn +++ b/components/leveldb_proto/BUILD.gn @@ -10,19 +10,21 @@ source_set("leveldb_proto") { "proto_database_impl.h", ] - deps = [ + public_deps = [ "//base", "//third_party/leveldatabase", ] } source_set("test_support") { + testonly = true sources = [ "testing/fake_db.h", ] public_deps = [ ":leveldb_proto", + "//base", "//components/leveldb_proto/testing/proto", ] } diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn index 836c243..d91e327 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -122,13 +122,13 @@ static_library("net") { "net/version_utils.h", "net/wifi_access_point_info_provider.cc", "net/wifi_access_point_info_provider.h", - "net/wifi_access_point_info_provider_chromeos.cc", - "net/wifi_access_point_info_provider_chromeos.h", ] public_deps = [ ":metrics", ] + allow_circular_includes_from = [ ":metrics" ] + deps = [ "//base", "//components/data_use_measurement/core", @@ -136,6 +136,14 @@ static_library("net") { "//net", "//url", ] + + if (is_chromeos) { + sources += [ + "net/wifi_access_point_info_provider_chromeos.cc", + "net/wifi_access_point_info_provider_chromeos.h", + ] + deps += [ "//chromeos" ] + } } # GYP version: components/metrics.gypi:metrics_profiler @@ -172,6 +180,7 @@ source_set("ui") { deps = [ "//base", "//ui/gfx", + "//ui/gfx/geometry", ] } @@ -188,6 +197,7 @@ if (!is_ios) { ] deps = [ "//base", + "//components/nacl/common:process_type", "//content/public/browser", "//content/public/common", ] @@ -272,8 +282,11 @@ source_set("unit_tests") { ":ui", "//base:prefs_test_support", "//base/test:test_support", + "//components/compression", "//components/variations", + "//net:test_support", "//testing/gtest", + "//ui/gfx/geometry", ] if (is_linux) { diff --git a/components/metrics_services_manager/BUILD.gn b/components/metrics_services_manager/BUILD.gn index 1039a1eb..9fa17b4 100644 --- a/components/metrics_services_manager/BUILD.gn +++ b/components/metrics_services_manager/BUILD.gn @@ -15,5 +15,6 @@ source_set("metrics_services_manager") { "//components/metrics", "//components/rappor", "//components/variations", + "//components/variations/service", ] } diff --git a/components/mime_util/BUILD.gn b/components/mime_util/BUILD.gn index 0e3a813..a61ed10 100644 --- a/components/mime_util/BUILD.gn +++ b/components/mime_util/BUILD.gn @@ -28,6 +28,7 @@ source_set("unit_tests") { deps = [ ":mime_util", "//base", + "//net", "//testing/gtest", ] } diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn index 7658660..3c34d4d 100644 --- a/components/nacl/BUILD.gn +++ b/components/nacl/BUILD.gn @@ -308,6 +308,7 @@ if (enable_nacl) { } } +# TODO(brettw) move to //components/nacl/common:switches source_set("nacl_switches") { sources = [ "common/nacl_switches.cc", @@ -315,6 +316,7 @@ source_set("nacl_switches") { ] } +# TODO(brettw) move to //components/nacl/common source_set("nacl_common") { sources = [ "common/nacl_cmd_line.cc", diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn new file mode 100644 index 0000000..a5c566c --- /dev/null +++ b/components/nacl/common/BUILD.gn @@ -0,0 +1,11 @@ +# Copyright 2015 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. + +# Depending on this allows targets to unconditionally include +# nacl_process_type.h without testing whether nacl is enabled. +source_set("process_type") { + public = [ + "nacl_process_type.h", + ] +} |