Commit abd4b686 authored by brettw@chromium.org's avatar brettw@chromium.org

Add gcm, nfc and bluetooth to GN build.

TBR=jamesr

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283486 0039d316-1c4b-4281-b951-d872f2087c98
parent 0a513f2a
...@@ -32,11 +32,14 @@ group("root") { ...@@ -32,11 +32,14 @@ group("root") {
"//components:all_components", "//components:all_components",
"//content", "//content",
"//crypto", "//crypto",
"//extensions/common/api", "//device/bluetooth",
"//device/nfc",
"//device/usb", "//device/usb",
"//extensions/common/api",
"//gin", "//gin",
"//gpu", "//gpu",
"//google_apis", "//google_apis",
"//google_apis/gcm",
"//ipc", "//ipc",
"//media", "//media",
"//mojo", "//mojo",
...@@ -182,6 +185,7 @@ group("root") { ...@@ -182,6 +185,7 @@ group("root") {
"//third_party/WebKit/public:all_blink", "//third_party/WebKit/public:all_blink",
# Not tested on Android yet: # Not tested on Android yet:
"//google_apis/gcm",
"//third_party/cld_2", "//third_party/cld_2",
"//third_party/libaddressinput", "//third_party/libaddressinput",
"//third_party/ffmpeg", "//third_party/ffmpeg",
......
...@@ -38,6 +38,7 @@ static_library("browser") { ...@@ -38,6 +38,7 @@ static_library("browser") {
"//chrome/browser/net:cert_logger_proto", "//chrome/browser/net:cert_logger_proto",
"//chrome/browser/net:probe_message_proto", "//chrome/browser/net:probe_message_proto",
"//chrome/browser/search/suggestions/proto", "//chrome/browser/search/suggestions/proto",
"//chrome/browser/ui",
"//chrome/common", "//chrome/common",
"//chrome/common/net", "//chrome/common/net",
"//components/autocomplete", "//components/autocomplete",
...@@ -48,6 +49,8 @@ static_library("browser") { ...@@ -48,6 +49,8 @@ static_library("browser") {
"//components/domain_reliability", "//components/domain_reliability",
"//components/favicon_base", "//components/favicon_base",
"//components/favicon/core", "//components/favicon/core",
"//components/feedback",
"//components/gcm_driver",
"//components/history/core/browser", "//components/history/core/browser",
"//components/history/core/common", "//components/history/core/common",
"//components/metrics:net", "//components/metrics:net",
...@@ -56,6 +59,8 @@ static_library("browser") { ...@@ -56,6 +59,8 @@ static_library("browser") {
"//components/policy:policy_component", "//components/policy:policy_component",
"//components/query_parser", "//components/query_parser",
"//components/rappor", "//components/rappor",
"//components/signin/core/browser",
"//components/startup_metric_utils",
"//components/strings", "//components/strings",
"//components/translate/core/browser", "//components/translate/core/browser",
"//components/translate/core/common", "//components/translate/core/common",
...@@ -84,10 +89,7 @@ static_library("browser") { ...@@ -84,10 +89,7 @@ static_library("browser") {
"//ui/strings", "//ui/strings",
"//ui/resources", "//ui/resources",
# TODO(GYP) # TODO(GYP)
#"browser_ui",
#"../components/components.gyp:bookmarks_browser", #"../components/components.gyp:bookmarks_browser",
#"../components/components.gyp:feedback_component",
#"../components/components.gyp:gcm_driver",
#"../components/components.gyp:google_core_browser", #"../components/components.gyp:google_core_browser",
#"../components/components.gyp:infobars_core", #"../components/components.gyp:infobars_core",
#"../components/components.gyp:invalidation", #"../components/components.gyp:invalidation",
...@@ -98,8 +100,6 @@ static_library("browser") { ...@@ -98,8 +100,6 @@ static_library("browser") {
#"../components/components.gyp:precache_core", #"../components/components.gyp:precache_core",
#"../components/components.gyp:search_engines", #"../components/components.gyp:search_engines",
#"../components/components.gyp:search_provider_logos", #"../components/components.gyp:search_provider_logos",
#"../components/components.gyp:signin_core_browser",
#"../components/components.gyp:startup_metric_utils",
#"../components/components.gyp:sync_driver", #"../components/components.gyp:sync_driver",
#"../jingle/jingle.gyp:notifier", #"../jingle/jingle.gyp:notifier",
#"../third_party/libjingle/libjingle.gyp:libjingle", #"../third_party/libjingle/libjingle.gyp:libjingle",
...@@ -143,6 +143,7 @@ static_library("browser") { ...@@ -143,6 +143,7 @@ static_library("browser") {
"//components/autofill/content/browser", "//components/autofill/content/browser",
"//components/dom_distiller/content", "//components/dom_distiller/content",
"//components/keyed_service/content", "//components/keyed_service/content",
"//components/storage_monitor",
"//components/translate/content/browser", "//components/translate/content/browser",
"//components/url_matcher", "//components/url_matcher",
"//components/usb_service", "//components/usb_service",
...@@ -178,7 +179,6 @@ static_library("browser") { ...@@ -178,7 +179,6 @@ static_library("browser") {
#"../components/components.gyp:password_manager_content_browser", #"../components/components.gyp:password_manager_content_browser",
#"../components/components.gyp:precache_content", #"../components/components.gyp:precache_content",
#"../components/components.gyp:sessions", #"../components/components.gyp:sessions",
#"../components/components.gyp:storage_monitor",
#"../media/cast/cast.gyp:cast_transport", #"../media/cast/cast.gyp:cast_transport",
#"../media/media.gyp:media", #"../media/media.gyp:media",
## TODO(tonyg): Remove this dependency (crbug.com/280157). ## TODO(tonyg): Remove this dependency (crbug.com/280157).
...@@ -455,10 +455,10 @@ static_library("browser") { ...@@ -455,10 +455,10 @@ static_library("browser") {
] ]
deps -= [ deps -= [
"//third_party/libaddressinput", "//third_party/libaddressinput",
#"../components/components.gyp:feedback_component", TODO(GYP) "//components/feedback",
#"../components/components.gyp:storage_monitor", TODO(GYP) "//components/storage_monitor",
#"../components/components.gyp:usb_service", TODO(GYP) "//components/usb_service",
#"../components/components.gyp:web_modal", TODO(GYP) "//components/web_modal",
] ]
} else { } else {
sources += rebase_path(gypi_values.chrome_browser_non_android_sources, sources += rebase_path(gypi_values.chrome_browser_non_android_sources,
......
...@@ -43,6 +43,7 @@ static_library("ui") { ...@@ -43,6 +43,7 @@ static_library("ui") {
"//components/dom_distiller/core", "//components/dom_distiller/core",
"//components/dom_distiller/webui", "//components/dom_distiller/webui",
"//components/feedback/proto", "//components/feedback/proto",
"//components/onc",
"//components/resources", "//components/resources",
"//components/strings", "//components/strings",
"//content/public/browser", "//content/public/browser",
...@@ -68,7 +69,6 @@ static_library("ui") { ...@@ -68,7 +69,6 @@ static_library("ui") {
#'../components/components.gyp:auto_login_parser', TODO(GYP) #'../components/components.gyp:auto_login_parser', TODO(GYP)
#'../components/components.gyp:invalidation', TODO(GYP) #'../components/components.gyp:invalidation', TODO(GYP)
#'../components/components.gyp:omaha_query_params', TODO(GYP) #'../components/components.gyp:omaha_query_params', TODO(GYP)
#'../components/components.gyp:onc_component', TODO(GYP)
#'../components/components.gyp:password_manager_core_browser', TODO(GYP) #'../components/components.gyp:password_manager_core_browser', TODO(GYP)
#'../ui/message_center/message_center.gyp:message_center', TODO(GYP) #'../ui/message_center/message_center.gyp:message_center', TODO(GYP)
] ]
...@@ -87,6 +87,8 @@ static_library("ui") { ...@@ -87,6 +87,8 @@ static_library("ui") {
"//chrome/browser/ui/webui/omnibox:mojo_bindings", "//chrome/browser/ui/webui/omnibox:mojo_bindings",
"//chrome/common/extensions/api:api", "//chrome/common/extensions/api:api",
"//components/autofill/content/browser:risk_proto", "//components/autofill/content/browser:risk_proto",
"//device/bluetooth",
"//device/nfc",
"//mojo/system", "//mojo/system",
"//net:net_with_v8", "//net:net_with_v8",
"//third_party/adobe/flash:flapper_version_h", "//third_party/adobe/flash:flapper_version_h",
...@@ -104,8 +106,6 @@ static_library("ui") { ...@@ -104,8 +106,6 @@ static_library("ui") {
"//webkit/common:storage", "//webkit/common:storage",
#'debugger', TODO(GYP) #'debugger', TODO(GYP)
#'installer_util', TODO(GYP) #'installer_util', TODO(GYP)
#'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP)
#'../device/nfc/nfc.gyp:device_nfc', TODO(GYP)
#'../media/media.gyp:media', TODO(GYP) #'../media/media.gyp:media', TODO(GYP)
#'../third_party/libjingle/libjingle.gyp:libjingle', TODO(GYP) #'../third_party/libjingle/libjingle.gyp:libjingle', TODO(GYP)
#'../ui/web_dialogs/web_dialogs.gyp:web_dialogs', TODO(GYP) #'../ui/web_dialogs/web_dialogs.gyp:web_dialogs', TODO(GYP)
......
...@@ -25,6 +25,7 @@ group("all_components") { ...@@ -25,6 +25,7 @@ group("all_components") {
"//components/favicon/core", "//components/favicon/core",
"//components/favicon_base", "//components/favicon_base",
"//components/feedback", "//components/feedback",
"//components/gcm_driver",
"//components/history/core/browser", "//components/history/core/browser",
"//components/history/core/common", "//components/history/core/common",
"//components/history/core/test", "//components/history/core/test",
...@@ -44,6 +45,7 @@ group("all_components") { ...@@ -44,6 +45,7 @@ group("all_components") {
"//components/rappor", "//components/rappor",
"//components/resources:components_resources", "//components/resources:components_resources",
"//components/search_engines", "//components/search_engines",
"//components/signin/core/browser",
"//components/startup_metric_utils", "//components/startup_metric_utils",
"//components/strings", "//components/strings",
"//components/tracing", "//components/tracing",
...@@ -89,6 +91,7 @@ group("all_components") { ...@@ -89,6 +91,7 @@ group("all_components") {
"//components/favicon_base", # Should work, needs checking. "//components/favicon_base", # Should work, needs checking.
"//components/favicon/core", # Blocked on keyed service. "//components/favicon/core", # Blocked on keyed service.
"//components/feedback", # Blocked on content. "//components/feedback", # Blocked on content.
"//components/gcm_driver", # Should work, needs checking.
"//components/history/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/common", # Should work, needs checking.
"//components/history/core/test", # Should work, needs checking. "//components/history/core/test", # Should work, needs checking.
...@@ -99,6 +102,7 @@ group("all_components") { ...@@ -99,6 +102,7 @@ group("all_components") {
"//components/policy", # Blocked on content (indirectly via autofill). "//components/policy", # Blocked on content (indirectly via autofill).
"//components/rappor", # Should work, needs checking. "//components/rappor", # Should work, needs checking.
"//components/search_engines", # Should work, needs checking. "//components/search_engines", # Should work, needs checking.
"//components/signin/core/browser", # Should work, needs checking.
"//components/translate/content/browser", # Blocked on content. "//components/translate/content/browser", # Blocked on content.
"//components/translate/content/common", # Blocked on content. "//components/translate/content/common", # Blocked on content.
"//components/translate/content/renderer", # Blocked on content. "//components/translate/content/renderer", # Blocked on content.
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
{ {
'targets': [ 'targets': [
{ {
# GN version: //components/gcm_driver
'target_name': 'gcm_driver', 'target_name': 'gcm_driver',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
'..', '..',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'gcm_driver/android/component_jni_registrar.cc', 'gcm_driver/android/component_jni_registrar.cc',
'gcm_driver/android/component_jni_registrar.h', 'gcm_driver/android/component_jni_registrar.h',
'gcm_driver/default_gcm_app_handler.cc', 'gcm_driver/default_gcm_app_handler.cc',
...@@ -64,6 +66,7 @@ ...@@ -64,6 +66,7 @@
], ],
}, },
{ {
# GN version: //components/gcm_driver:test_support
'target_name': 'gcm_driver_test_support', 'target_name': 'gcm_driver_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -76,6 +79,7 @@ ...@@ -76,6 +79,7 @@
'..', '..',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'gcm_driver/fake_gcm_app_handler.cc', 'gcm_driver/fake_gcm_app_handler.cc',
'gcm_driver/fake_gcm_app_handler.h', 'gcm_driver/fake_gcm_app_handler.h',
'gcm_driver/fake_gcm_client.cc', 'gcm_driver/fake_gcm_client.cc',
......
# 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("gcm_driver") {
sources = [
"android/component_jni_registrar.cc",
"android/component_jni_registrar.h",
"default_gcm_app_handler.cc",
"default_gcm_app_handler.h",
"gcm_activity.cc",
"gcm_activity.h",
"gcm_app_handler.cc",
"gcm_app_handler.h",
"gcm_client.cc",
"gcm_client.h",
"gcm_client_factory.cc",
"gcm_client_factory.h",
"gcm_client_impl.cc",
"gcm_client_impl.h",
"gcm_driver.cc",
"gcm_driver.h",
"gcm_driver_android.cc",
"gcm_driver_android.h",
"gcm_driver_desktop.cc",
"gcm_driver_desktop.h",
"gcm_stats_recorder_impl.cc",
"gcm_stats_recorder_impl.h",
"system_encryptor.cc",
"system_encryptor.h",
]
deps = [
"//base",
"//components/os_crypt",
"//google_apis/gcm",
"//net",
]
if (is_android) {
sources -= [
"gcm_client_factory.cc",
"gcm_client_factory.h",
"gcm_client_impl.cc",
"gcm_client_impl.h",
"gcm_driver_desktop.cc",
"gcm_driver_desktop.h",
"gcm_stats_recorder_impl.cc",
"gcm_stats_recorder_impl.h",
]
deps -= [ "//google_apis/gcm" ]
deps += [ ":jni_headers" ]
}
}
static_library("test_support") {
sources = [
"fake_gcm_app_handler.cc",
"fake_gcm_app_handler.h",
"fake_gcm_client.cc",
"fake_gcm_client.h",
"fake_gcm_client_factory.cc",
"fake_gcm_client_factory.h",
"fake_gcm_driver.cc",
"fake_gcm_driver.h",
]
deps = [
":gcm_driver",
"//base",
"//google_apis/gcm",
"//testing/gtest",
]
if (is_android) {
sources -= [
"fake_gcm_client.cc",
"fake_gcm_client.h",
"fake_gcm_client_factory.cc",
"fake_gcm_client_factory.h",
]
deps -= [ "//google_apis/gcm" ]
}
}
#TODO(GYP) gcm_driver_java gcm_driver_jni_headers
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
{ {
'targets': [ 'targets': [
{ {
# GN version: //components/signin/core/common
'target_name': 'signin_core_common', 'target_name': 'signin_core_common',
'type': 'static_library', 'type': 'static_library',
'include_dirs': [ 'include_dirs': [
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
], ],
}, },
{ {
# GN version: //components/signin/core/browser
'target_name': 'signin_core_browser', 'target_name': 'signin_core_browser',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -39,6 +41,7 @@ ...@@ -39,6 +41,7 @@
'..', '..',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'signin/core/browser/about_signin_internals.cc', 'signin/core/browser/about_signin_internals.cc',
'signin/core/browser/about_signin_internals.h', 'signin/core/browser/about_signin_internals.h',
'signin/core/browser/account_reconcilor.cc', 'signin/core/browser/account_reconcilor.cc',
...@@ -91,6 +94,7 @@ ...@@ -91,6 +94,7 @@
'msvs_disabled_warnings': [4267, ], 'msvs_disabled_warnings': [4267, ],
}, },
{ {
# GN version: //components/signin/core/browser:test_support
'target_name': 'signin_core_browser_test_support', 'target_name': 'signin_core_browser_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -101,6 +105,7 @@ ...@@ -101,6 +105,7 @@
'..', '..',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'signin/core/browser/fake_auth_status_provider.cc', 'signin/core/browser/fake_auth_status_provider.cc',
'signin/core/browser/fake_auth_status_provider.h', 'signin/core/browser/fake_auth_status_provider.h',
'signin/core/browser/test_signin_client.cc', 'signin/core/browser/test_signin_client.cc',
...@@ -112,6 +117,7 @@ ...@@ -112,6 +117,7 @@
['OS == "ios"', { ['OS == "ios"', {
'targets': [ 'targets': [
{ {
# GN version: //components/signin/core/browser:ios
'target_name': 'signin_ios_browser', 'target_name': 'signin_ios_browser',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -122,6 +128,7 @@ ...@@ -122,6 +128,7 @@
'..', '..',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'signin/ios/browser/profile_oauth2_token_service_ios.h', 'signin/ios/browser/profile_oauth2_token_service_ios.h',
'signin/ios/browser/profile_oauth2_token_service_ios.mm', 'signin/ios/browser/profile_oauth2_token_service_ios.mm',
], ],
......
# 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 = [
"about_signin_internals.cc",
"about_signin_internals.h",
"account_reconcilor.cc",
"account_reconcilor.h",
"account_service_flag_fetcher.cc",
"account_service_flag_fetcher.h",
"mutable_profile_oauth2_token_service.cc",
"mutable_profile_oauth2_token_service.h",
"profile_oauth2_token_service.cc",
"profile_oauth2_token_service.h",
"signin_account_id_helper.cc",
"signin_account_id_helper.h",
"signin_client.h",
"signin_error_controller.cc",
"signin_error_controller.h",
"signin_internals_util.cc",
"signin_internals_util.h",
"signin_manager_base.cc",
"signin_manager_base.h",
"signin_manager.cc",
"signin_manager.h",
"signin_manager_cookie_helper.cc",
"signin_manager_cookie_helper.h",
"signin_metrics.cc",
"signin_metrics.h",
"signin_oauth_helper.cc",
"signin_oauth_helper.h",
"signin_tracker.cc",
"signin_tracker.h",
"webdata/token_service_table.cc",
"webdata/token_service_table.h",
"webdata/token_web_data.cc",
"webdata/token_web_data.h",
]
deps = [
"//base",
"//crypto",
"//google_apis",
"//net",
"//sql",
"//third_party/icu",
"//components/keyed_service/core",
"//components/os_crypt",
"//components/webdata/common",
]
if (is_android) {
sources -= [
"mutable_profile_oauth2_token_service.cc",
"mutable_profile_oauth2_token_service.h",
]
}
if (is_chromeos) {
sources -= [
"signin_manager.cc",
]
}
if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}
}
static_library("test_support") {
sources = [
"fake_auth_status_provider.cc",
"fake_auth_status_provider.h",
"test_signin_client.cc",
"test_signin_client.h",
]
deps = [
":browser",
"//testing/gtest",
]
}
# 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 = [
"signin_pref_names.cc",
"signin_pref_names.h",
"signin_switches.cc",
"signin_switches.h",
"profile_management_switches.cc",
"profile_management_switches.h",
]
}
# 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 = [
"profile_oauth2_token_service_ios.h",
"profile_oauth2_token_service_ios.mm",
]
deps = [
"//signin/core/browser",
#'../ios/provider/ios_components.gyp:ios_components', TODO(GYP)
]
}
# 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("//tools/grit/grit_rule.gni")
config("bluetooth_config") {
if (is_win) {
ldflags = [
# Despite MSDN stating that Bthprops.dll contains the
# symbols declared by bthprops.lib, they actually reside here:
"/DELAYLOAD:Bthprops.cpl",
"/DELAYLOAD:setupapi.dll",
]
}
}
static_library("bluetooth") {
sources = [
"bluetooth_adapter.cc",
"bluetooth_adapter.h",
"bluetooth_adapter_chromeos.cc",
"bluetooth_adapter_chromeos.h",
"bluetooth_adapter_factory.cc",
"bluetooth_adapter_factory.h",
"bluetooth_adapter_mac.h",
"bluetooth_adapter_mac.mm",
"bluetooth_adapter_win.cc",
"bluetooth_adapter_win.h",
"bluetooth_channel_mac.mm",
"bluetooth_channel_mac.h",
"bluetooth_device.cc",
"bluetooth_device.h",
"bluetooth_device_chromeos.cc",
"bluetooth_device_chromeos.h",
"bluetooth_device_mac.h",
"bluetooth_device_mac.mm",
"bluetooth_device_win.cc",
"bluetooth_device_win.h",
"bluetooth_discovery_manager_mac.mm",
"bluetooth_discovery_manager_mac.h",
"bluetooth_discovery_session.cc",
"bluetooth_discovery_session.h",
"bluetooth_gatt_characteristic.cc",
"bluetooth_gatt_characteristic.h",
"bluetooth_gatt_connection.cc",
"bluetooth_gatt_connection.h",
"bluetooth_gatt_connection_chromeos.cc",
"bluetooth_gatt_connection_chromeos.h",
"bluetooth_gatt_descriptor.cc",
"bluetooth_gatt_descriptor.h",
"bluetooth_gatt_notify_session.cc",
"bluetooth_gatt_notify_session.h",
"bluetooth_gatt_notify_session_chromeos.cc",
"bluetooth_gatt_notify_session_chromeos.h",
"bluetooth_gatt_service.cc",
"bluetooth_gatt_service.h",
"bluetooth_init_win.cc",
"bluetooth_init_win.h",
"bluetooth_l2cap_channel_mac.mm",
"bluetooth_l2cap_channel_mac.h",
"bluetooth_low_energy_win.cc",
"bluetooth_low_energy_win.h",
"bluetooth_pairing_chromeos.cc",
"bluetooth_pairing_chromeos.h",
"bluetooth_remote_gatt_characteristic_chromeos.cc",
"bluetooth_remote_gatt_characteristic_chromeos.h",
"bluetooth_remote_gatt_descriptor_chromeos.cc",
"bluetooth_remote_gatt_descriptor_chromeos.h",
"bluetooth_remote_gatt_service_chromeos.cc",
"bluetooth_remote_gatt_service_chromeos.h",
"bluetooth_rfcomm_channel_mac.mm",
"bluetooth_rfcomm_channel_mac.h",
"bluetooth_service_record_win.cc",
"bluetooth_service_record_win.h",
"bluetooth_socket.cc",
"bluetooth_socket.h",
"bluetooth_socket_chromeos.cc",
"bluetooth_socket_chromeos.h",
"bluetooth_socket_mac.h",
"bluetooth_socket_mac.mm",
"bluetooth_socket_net.cc",
"bluetooth_socket_net.h",
"bluetooth_socket_thread.cc",
"bluetooth_socket_thread.h",
"bluetooth_socket_win.cc",
"bluetooth_socket_win.h",
"bluetooth_task_manager_win.cc",
"bluetooth_task_manager_win.h",
"bluetooth_uuid.cc",
"bluetooth_uuid.h",
]
all_dependent_configs = [ ":bluetooth_config" ]
deps = [
":strings",
"//base",
"//base/third_party/dynamic_annotations",
"//net",
"//third_party/libxml",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
]
if (is_chromeos) {
deps += [
"//dbus",
#'../../chromeos/chromeos.gyp:chromeos', TODO(GYP)
]
}
if (is_mac) {
libs = [ "IOBluetooth.framework" ]
}
}
grit("strings") {
visibility = ":*"
source = "bluetooth_strings.grd"
}
static_library("mocks") {
sources = [
"test/mock_bluetooth_adapter.cc",
"test/mock_bluetooth_adapter.h",
"test/mock_bluetooth_device.cc",
"test/mock_bluetooth_device.h",
"test/mock_bluetooth_discovery_session.cc",
"test/mock_bluetooth_discovery_session.h",
"test/mock_bluetooth_gatt_characteristic.cc",
"test/mock_bluetooth_gatt_characteristic.h",
"test/mock_bluetooth_gatt_connection.cc",
"test/mock_bluetooth_gatt_connection.h",
"test/mock_bluetooth_gatt_descriptor.cc",
"test/mock_bluetooth_gatt_descriptor.h",
"test/mock_bluetooth_gatt_notify_session.cc",
"test/mock_bluetooth_gatt_notify_session.h",
"test/mock_bluetooth_gatt_service.cc",
"test/mock_bluetooth_gatt_service.h",
"test/mock_bluetooth_socket.cc",
"test/mock_bluetooth_socket.h",
]
deps = [
":bluetooth",
"//testing/gmock",
]
}
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
}, },
'targets': [ 'targets': [
{ {
# GN version: //device/bluetooth
'target_name': 'device_bluetooth', 'target_name': 'device_bluetooth',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
'bluetooth_strings.gyp:device_bluetooth_strings', 'bluetooth_strings.gyp:device_bluetooth_strings',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'bluetooth_adapter.cc', 'bluetooth_adapter.cc',
'bluetooth_adapter.h', 'bluetooth_adapter.h',
'bluetooth_adapter_chromeos.cc', 'bluetooth_adapter_chromeos.cc',
...@@ -126,6 +128,7 @@ ...@@ -126,6 +128,7 @@
], ],
}, },
{ {
# GN version: //device/bluetooth:mocks
'target_name': 'device_bluetooth_mocks', 'target_name': 'device_bluetooth_mocks',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -136,6 +139,7 @@ ...@@ -136,6 +139,7 @@
'../../', '../../',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'test/mock_bluetooth_adapter.cc', 'test/mock_bluetooth_adapter.cc',
'test/mock_bluetooth_adapter.h', 'test/mock_bluetooth_adapter.h',
'test/mock_bluetooth_device.cc', 'test/mock_bluetooth_device.cc',
......
# 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("nfc") {
sources = [
"nfc_adapter.cc",
"nfc_adapter.h",
"nfc_adapter_chromeos.cc",
"nfc_adapter_chromeos.h",
"nfc_adapter_factory.cc",
"nfc_adapter_factory.h",
"nfc_ndef_record.cc",
"nfc_ndef_record.h",
"nfc_ndef_record_utils_chromeos.cc",
"nfc_ndef_record_utils_chromeos.h",
"nfc_peer.cc",
"nfc_peer.h",
"nfc_peer_chromeos.cc",
"nfc_peer_chromeos.h",
"nfc_tag.cc",
"nfc_tag.h",
"nfc_tag_chromeos.cc",
"nfc_tag_chromeos.h",
"nfc_tag_technology.cc",
"nfc_tag_technology.h",
"nfc_tag_technology_chromeos.cc",
"nfc_tag_technology_chromeos.h"
]
deps = [
"//base",
"//url",
]
if (is_chromeos) {
deps += [
"//dbus",
#'../../chromeos/chromeos.gyp:chromeos', TODO(GYP)
]
}
}
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
}, },
'targets': [ 'targets': [
{ {
# GN version: //device/nfc
'target_name': 'device_nfc', 'target_name': 'device_nfc',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
'../../url/url.gyp:url_lib', '../../url/url.gyp:url_lib',
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'nfc_adapter.cc', 'nfc_adapter.cc',
'nfc_adapter.h', 'nfc_adapter.h',
'nfc_adapter_chromeos.cc', 'nfc_adapter_chromeos.cc',
......
# 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")
component("gcm") {
sources = [
"base/mcs_message.cc",
"base/mcs_message.h",
"base/mcs_util.cc",
"base/mcs_util.h",
"base/socket_stream.cc",
"base/socket_stream.h",
"engine/checkin_request.cc",
"engine/checkin_request.h",
"engine/connection_factory.cc",
"engine/connection_factory.h",
"engine/connection_factory_impl.cc",
"engine/connection_factory_impl.h",
"engine/connection_handler.cc",
"engine/connection_handler.h",
"engine/connection_handler_impl.cc",
"engine/connection_handler_impl.h",
"engine/gcm_store.cc",
"engine/gcm_store.h",
"engine/gcm_store_impl.cc",
"engine/gcm_store_impl.h",
"engine/gservices_settings.cc",
"engine/gservices_settings.h",
"engine/heartbeat_manager.cc",
"engine/heartbeat_manager.h",
"engine/mcs_client.cc",
"engine/mcs_client.h",
"engine/registration_info.cc",
"engine/registration_info.h",
"engine/registration_request.cc",
"engine/registration_request.h",
"engine/unregistration_request.cc",
"engine/unregistration_request.h",
"monitoring/gcm_stats_recorder.h",
]
defines = [ "GCM_IMPLEMENTATION" ]
deps = [
":proto",
"//base",
"//base/third_party/dynamic_annotations",
"//net",
"//third_party/leveldatabase",
"//url",
]
forward_dependent_configs_from = [ ":proto" ]
}
proto_library("proto") {
visibility = ":*"
sources = [
"protocol/android_checkin.proto",
"protocol/checkin.proto",
"protocol/mcs.proto",
]
}
static_library("test_support") {
sources = [
"base/fake_encryptor.cc",
"base/fake_encryptor.h",
"engine/fake_connection_factory.cc",
"engine/fake_connection_factory.h",
"engine/fake_connection_handler.cc",
"engine/fake_connection_handler.h",
"monitoring/fake_gcm_stats_recorder.cc",
"monitoring/fake_gcm_stats_recorder.h",
]
deps = [
":gcm",
"//base",
"//testing/gtest",
]
forward_dependent_configs_from = [ ":gcm" ]
}
# A standalone MCS (mobile connection server) client.
executable("mcs_probe") {
sources = [
"tools/mcs_probe.cc",
]
deps = [
":gcm",
":test_support",
"//base",
"//net",
"//net:test_support",
]
}
test("gcm_unit_tests") {
sources = [
"base/mcs_message_unittest.cc",
"base/mcs_util_unittest.cc",
"base/socket_stream_unittest.cc",
"engine/checkin_request_unittest.cc",
"engine/connection_factory_impl_unittest.cc",
"engine/connection_handler_impl_unittest.cc",
"engine/gcm_store_impl_unittest.cc",
"engine/gservices_settings_unittest.cc",
"engine/heartbeat_manager_unittest.cc",
"engine/mcs_client_unittest.cc",
"engine/registration_request_unittest.cc",
"engine/unregistration_request_unittest.cc",
]
deps = [
":test_support",
"//base",
"//base/test:run_all_unittests",
"//net",
"//net:test_support",
"//testing/gtest",
]
}
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
'targets': [ 'targets': [
# The public GCM target. # The public GCM target.
{ {
# GN version: //google_apis/gcm
'target_name': 'gcm', 'target_name': 'gcm',
'type': '<(component)', 'type': '<(component)',
'variables': { 'variables': {
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
'../../url/url.gyp:url_lib', '../../url/url.gyp:url_lib',
], ],
'sources': [ 'sources': [
# Note: sources list duplicated in GN build.
'base/mcs_message.cc', 'base/mcs_message.cc',
'base/mcs_message.h', 'base/mcs_message.h',
'base/mcs_util.cc', 'base/mcs_util.cc',
...@@ -81,6 +83,7 @@ ...@@ -81,6 +83,7 @@
# The test support library that is needed to test gcm. # The test support library that is needed to test gcm.
{ {
# GN version: //google_apis/gcm:test_support
'target_name': 'gcm_test_support', 'target_name': 'gcm_test_support',
'type': 'static_library', 'type': 'static_library',
'include_dirs': [ 'include_dirs': [
...@@ -96,6 +99,7 @@ ...@@ -96,6 +99,7 @@
'gcm', 'gcm',
], ],
'sources': [ 'sources': [
# Note: sources list duplicated in GN build.
'base/fake_encryptor.cc', 'base/fake_encryptor.cc',
'base/fake_encryptor.h', 'base/fake_encryptor.h',
'engine/fake_connection_factory.cc', 'engine/fake_connection_factory.cc',
...@@ -109,6 +113,7 @@ ...@@ -109,6 +113,7 @@
# A standalone MCS (mobile connection server) client. # A standalone MCS (mobile connection server) client.
{ {
# GN version: //google_apis/gcm:mcs_probe
'target_name': 'mcs_probe', 'target_name': 'mcs_probe',
'type': 'executable', 'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, }, 'variables': { 'enable_wexit_time_destructors': 1, },
...@@ -124,6 +129,7 @@ ...@@ -124,6 +129,7 @@
'gcm_test_support' 'gcm_test_support'
], ],
'sources': [ 'sources': [
# Note: file list duplicated in GN build.
'tools/mcs_probe.cc', 'tools/mcs_probe.cc',
], ],
}, },
...@@ -146,7 +152,6 @@ ...@@ -146,7 +152,6 @@
'../../net/net.gyp:net_test_support', '../../net/net.gyp:net_test_support',
'../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../../third_party/protobuf/protobuf.gyp:protobuf_lite', '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
'mcs_probe',
'gcm', 'gcm',
'gcm_test_support' 'gcm_test_support'
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment