Skip to content

Commit

Permalink
Add more components to the GN build.
Browse files Browse the repository at this point in the history
google
infobars
invalidation
navigation_intercaption
network_time
password_manager
plugins
search_provider_logos
sessions

R=viettrungluu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283521 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Jul 16, 2014
1 parent 82d1419 commit ce9926c
Show file tree
Hide file tree
Showing 21 changed files with 554 additions and 3 deletions.
27 changes: 25 additions & 2 deletions components/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,27 @@ group("all_components") {
"//components/favicon_base",
"//components/feedback",
"//components/gcm_driver",
"//components/google/core/browser",
"//components/history/core/browser",
"//components/history/core/common",
"//components/history/core/test",
"//components/infobars/core",
"//components/infobars/test:test_support",
"//components/invalidation",
"//components/json_schema",
"//components/language_usage_metrics",
"//components/leveldb_proto",
"//components/metrics",
"//components/navigation_interception",
"//components/navigation_metrics",
"//components/network_time",
"//components/omaha_query_params",
"//components/onc",
"//components/os_crypt",
"//components/password_manager/content/browser",
"//components/password_manager/core/browser",
"//components/password_manager/core/common",
"//components/plugins/renderer",
"//components/policy",
"//components/precache/core",
"//components/precache/content",
Expand All @@ -45,6 +55,8 @@ group("all_components") {
"//components/rappor",
"//components/resources:components_resources",
"//components/search_engines",
"//components/search_provider_logos",
"//components/sessions",
"//components/signin/core/browser",
"//components/startup_metric_utils",
"//components/strings",
Expand Down Expand Up @@ -92,16 +104,27 @@ group("all_components") {
"//components/favicon/core", # Blocked on keyed service.
"//components/feedback", # Blocked on content.
"//components/gcm_driver", # Should work, needs checking.
"//components/google/core/browser", # Should work, needs checking.
"//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/infobars/core", # Should work, needs checking.
"//components/infobars/test:test_support", # Should work, needs checking.
"//components/invalidation", # Should work, needs checking.
"//components/json_schema", # Should work, needs checking.
"//components/keyed_service/content", # Blocked on content.
"//components/precache/core", # Should work, needs checking.
"//components/precache/content", # Blocked on content.
"//components/navigation_interception", # Blocked on content.
"//components/password_manager/content/browser", # Blocked on content.
"//components/password_manager/core/browser", # Should work, needs checking.
"//components/password_manager/core/common", # Should work, needs checking.
"//components/plugins/renderer", # Blocked on blink.
"//components/policy", # Blocked on content (indirectly via autofill).
"//components/precache/content", # Blocked on content.
"//components/precache/core", # Should work, needs checking.
"//components/rappor", # Should work, needs checking.
"//components/search_engines", # Should work, needs checking.
"//components/search_provider_logos", # Should work, needs checking.
"//components/sessions", # Blocked on content.
"//components/signin/core/browser", # Should work, needs checking.
"//components/translate/content/browser", # Blocked on content.
"//components/translate/content/common", # Blocked on content.
Expand Down
2 changes: 2 additions & 0 deletions components/google.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{
'targets': [
{
# GN version: //components/google/core/browser
'target_name': 'google_core_browser',
'type': 'static_library',
'dependencies': [
Expand All @@ -21,6 +22,7 @@
'..',
],
'sources': [
# Note: sources duplicated in GN build.
'google/core/browser/google_pref_names.cc',
'google/core/browser/google_pref_names.h',
'google/core/browser/google_search_metrics.cc',
Expand Down
42 changes: 42 additions & 0 deletions components/google/core/browser/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# 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 = [
"google_pref_names.cc",
"google_pref_names.h",
"google_search_metrics.cc",
"google_search_metrics.h",
"google_switches.cc",
"google_switches.h",
"google_url_tracker.cc",
"google_url_tracker.h",
"google_url_tracker_client.cc",
"google_url_tracker_client.h",
"google_url_tracker_infobar_delegate.cc",
"google_url_tracker_infobar_delegate.h",
"google_url_tracker_map_entry.cc",
"google_url_tracker_map_entry.h",
"google_url_tracker_navigation_helper.cc",
"google_url_tracker_navigation_helper.h",
"google_util.cc",
"google_util.h",
]

if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}

deps = [
"//base",
"//components/keyed_service/core",
"//components/infobars/core",
"//components/strings",
"//components/url_fixer",
"//net",
"//ui/base",
"//url",
]
}
6 changes: 5 additions & 1 deletion components/infobars.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{
'targets': [
{
# GN version: //components/infobars/core
'target_name': 'infobars_core',
'type': 'static_library',
'include_dirs': [
Expand All @@ -17,6 +18,7 @@
'../ui/strings/ui_strings.gyp:ui_strings',
],
'sources': [
# Note: sources duplicated in GN build.
'infobars/core/confirm_infobar_delegate.cc',
'infobars/core/confirm_infobar_delegate.h',
'infobars/core/infobar.cc',
Expand All @@ -33,8 +35,9 @@
],
},
{
# GN version: //components/infobars/test:test_support
'target_name': 'infobars_test_support',
'type': 'static_library',
'type': 'static_library',
'include_dirs': [
'..',
],
Expand All @@ -43,6 +46,7 @@
'../skia/skia.gyp:skia',
],
'sources': [
# Note: sources list duplicated in GN build.
'infobars/test/infobar_test.cc',
],
},
Expand Down
31 changes: 31 additions & 0 deletions components/infobars/core/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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 = [
"confirm_infobar_delegate.cc",
"confirm_infobar_delegate.h",
"infobar.cc",
"infobar.h",
"infobar_android.cc",
"infobar_container.cc",
"infobar_container.h",
"infobar_delegate.cc",
"infobar_delegate.h",
"infobar_manager.cc",
"infobar_manager.h",
"infobars_switches.cc",
"infobars_switches.h",
]

deps = [
"//base",
"//skia",
"//ui/gfx",
"//ui/strings",
]

# This target exposes Skia headers in its public headers.
forward_dependent_configs_from = [ "//skia" ]
}
14 changes: 14 additions & 0 deletions components/infobars/test/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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("test_support") {
sources = [
"infobar_test.cc",
]

deps = [
"//base",
"//skia",
]
}
6 changes: 6 additions & 0 deletions components/invalidation.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{
'targets': [
{
# GN version: //components/invalidation
'target_name': 'invalidation',
'type': 'static_library',
'dependencies': [
Expand All @@ -22,6 +23,7 @@
'..',
],
'sources': [
# Note: sources list duplicated in GN build.
'invalidation/invalidation_logger.cc',
'invalidation/invalidation_logger.h',
'invalidation/invalidation_logger_observer.h',
Expand All @@ -42,6 +44,7 @@
'conditions': [
['OS != "android"', {
'sources': [
# Note: sources list duplicated in GN build.
'invalidation/gcm_invalidation_bridge.cc',
'invalidation/gcm_invalidation_bridge.h',
'invalidation/gcm_network_channel.cc',
Expand Down Expand Up @@ -72,6 +75,7 @@
},

{
# GN version: //components/invalidation:test_support
'target_name': 'invalidation_test_support',
'type': 'static_library',
'dependencies': [
Expand All @@ -91,6 +95,7 @@
'..',
],
'sources': [
# Note: sources list duplicated in GN build.
'invalidation/fake_invalidation_handler.cc',
'invalidation/fake_invalidation_handler.h',
'invalidation/fake_invalidation_state_tracker.cc',
Expand All @@ -105,6 +110,7 @@
'conditions': [
['OS != "android"', {
'sources': [
# Note: sources list duplicated in GN build.
'invalidation/p2p_invalidation_service.cc',
'invalidation/p2p_invalidation_service.h',
],
Expand Down
101 changes: 101 additions & 0 deletions components/invalidation/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# 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("invalidation") {
sources = [
"invalidation_logger.cc",
"invalidation_logger.h",
"invalidation_logger_observer.h",
"invalidation_prefs.cc",
"invalidation_prefs.h",
"invalidation_service.h",
"invalidation_service_util.cc",
"invalidation_service_util.h",
"invalidation_switches.cc",
"invalidation_switches.h",
"invalidator_registrar.cc",
"invalidator_registrar.h",
"invalidator_storage.cc",
"invalidator_storage.h",
"profile_invalidation_provider.cc",
"profile_invalidation_provider.h",
]
if (!is_android) {
sources += [
"gcm_invalidation_bridge.cc",
"gcm_invalidation_bridge.h",
"gcm_network_channel.cc",
"gcm_network_channel.h",
"gcm_network_channel_delegate.h",
"invalidation_notifier.cc",
"invalidation_notifier.h",
"non_blocking_invalidator.cc",
"non_blocking_invalidator.h",
"notifier_reason_util.cc",
"notifier_reason_util.h",
"p2p_invalidator.cc",
"p2p_invalidator.h",
"push_client_channel.cc",
"push_client_channel.h",
"state_writer.h",
"sync_invalidation_listener.cc",
"sync_invalidation_listener.h",
"sync_system_resources.cc",
"sync_system_resources.h",
"ticl_invalidation_service.cc",
"ticl_invalidation_service.h",
"ticl_settings_provider.cc",
"ticl_settings_provider.h",
]
}

# TODO(GYP) remove this when libjingle is added.
configs += [ "//content:libjingle_stub_config" ]

deps = [
"//base",
#"//components/gcm_driver", TODO(GYP)
"//google_apis",
"//components/keyed_service/core",
"//components/pref_registry",
#"//components/signin/core/browser", TODO(GYP)
"//sync",
"//third_party/cacheinvalidation",
#'../jingle/jingle.gyp:notifier', TODO(GYP)
]
}

static_library("test_support") {
sources = [
"fake_invalidation_handler.cc",
"fake_invalidation_handler.h",
"fake_invalidation_state_tracker.cc",
"fake_invalidation_state_tracker.h",
"fake_invalidator.cc",
"fake_invalidator.h",
"invalidation_service_test_template.cc",
"invalidation_service_test_template.h",
"invalidator_test_template.cc",
"invalidator_test_template.h",
]
if (!is_android) {
sources += [
"p2p_invalidation_service.cc",
"p2p_invalidation_service.h",
]
}

deps = [
"//base",
"//google_apis",
"//net",
"//sync",
"//testing/gmock",
"//third_party/cacheinvalidation",
#'../jingle/jingle.gyp:notifier', TODO(GYP)
#'../jingle/jingle.gyp:notifier_test_util', TODO(GYP)
#'../sync/sync.gyp:test_support_sync_notifier', TODO(GYP)
#'gcm_driver_test_support', TODO(GYP)
]
}
5 changes: 5 additions & 0 deletions components/navigation_interception.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{
'targets': [
{
# GN version: //components/navigation_interception
'target_name': 'navigation_interception',
'type': 'static_library',
'defines!': ['CONTENT_IMPLEMENTATION'],
Expand All @@ -20,6 +21,7 @@
'../skia/config',
],
'sources': [
# Note: sources list duplicated in GN build.
'navigation_interception/intercept_navigation_resource_throttle.cc',
'navigation_interception/intercept_navigation_resource_throttle.h',
'navigation_interception/navigation_params.h',
Expand All @@ -31,6 +33,7 @@
'navigation_interception_jni_headers',
],
'sources': [
# Note: sources list duplicated in GN build.
'navigation_interception/component_jni_registrar.cc',
'navigation_interception/component_jni_registrar.h',
'navigation_interception/intercept_navigation_delegate.cc',
Expand All @@ -57,9 +60,11 @@
'includes': [ '../build/java.gypi' ],
},
{
# GN version: //components/navigation_intercaption:jni_headers
'target_name': 'navigation_interception_jni_headers',
'type': 'none',
'sources': [
# Note: sources list duplicated in GN build.
'navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java',
'navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java',
],
Expand Down
Loading

0 comments on commit ce9926c

Please sign in to comment.