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

BUILD.gn

@@ -32,11 +32,14 @@ group("root") {
     "//components:all_components",
     "//content",
     "//crypto",
-    "//extensions/common/api",
+    "//device/bluetooth",
+    "//device/nfc",
     "//device/usb",
+    "//extensions/common/api",
     "//gin",
     "//gpu",
     "//google_apis",
+    "//google_apis/gcm",
     "//ipc",
     "//media",
     "//mojo",
@@ -182,6 +185,7 @@ group("root") {
       "//third_party/WebKit/public:all_blink",
 
       # Not tested on Android yet:
+      "//google_apis/gcm",
       "//third_party/cld_2",
       "//third_party/libaddressinput",
       "//third_party/ffmpeg",

chrome/browser/BUILD.gn

@@ -38,6 +38,7 @@ static_library("browser") {
     "//chrome/browser/net:cert_logger_proto",
     "//chrome/browser/net:probe_message_proto",
     "//chrome/browser/search/suggestions/proto",
+    "//chrome/browser/ui",
     "//chrome/common",
     "//chrome/common/net",
     "//components/autocomplete",
@@ -48,6 +49,8 @@ static_library("browser") {
     "//components/domain_reliability",
     "//components/favicon_base",
     "//components/favicon/core",
+    "//components/feedback",
+    "//components/gcm_driver",
     "//components/history/core/browser",
     "//components/history/core/common",
     "//components/metrics:net",
@@ -56,6 +59,8 @@ static_library("browser") {
     "//components/policy:policy_component",
     "//components/query_parser",
     "//components/rappor",
+    "//components/signin/core/browser",
+    "//components/startup_metric_utils",
     "//components/strings",
     "//components/translate/core/browser",
     "//components/translate/core/common",
@@ -84,10 +89,7 @@ static_library("browser") {
     "//ui/strings",
     "//ui/resources",
     # TODO(GYP)
-    #"browser_ui",
     #"../components/components.gyp:bookmarks_browser",
-    #"../components/components.gyp:feedback_component",
-    #"../components/components.gyp:gcm_driver",
     #"../components/components.gyp:google_core_browser",
     #"../components/components.gyp:infobars_core",
     #"../components/components.gyp:invalidation",
@@ -98,8 +100,6 @@ static_library("browser") {
     #"../components/components.gyp:precache_core",
     #"../components/components.gyp:search_engines",
     #"../components/components.gyp:search_provider_logos",
-    #"../components/components.gyp:signin_core_browser",
-    #"../components/components.gyp:startup_metric_utils",
     #"../components/components.gyp:sync_driver",
     #"../jingle/jingle.gyp:notifier",
     #"../third_party/libjingle/libjingle.gyp:libjingle",
@@ -143,6 +143,7 @@ static_library("browser") {
       "//components/autofill/content/browser",
       "//components/dom_distiller/content",
       "//components/keyed_service/content",
+      "//components/storage_monitor",
       "//components/translate/content/browser",
       "//components/url_matcher",
       "//components/usb_service",
@@ -178,7 +179,6 @@ static_library("browser") {
       #"../components/components.gyp:password_manager_content_browser",
       #"../components/components.gyp:precache_content",
       #"../components/components.gyp:sessions",
-      #"../components/components.gyp:storage_monitor",
       #"../media/cast/cast.gyp:cast_transport",
       #"../media/media.gyp:media",
       ## TODO(tonyg): Remove this dependency (crbug.com/280157).
@@ -455,10 +455,10 @@ static_library("browser") {
     ]
     deps -= [
       "//third_party/libaddressinput",
-      #"../components/components.gyp:feedback_component",  TODO(GYP)
-      #"../components/components.gyp:storage_monitor",  TODO(GYP)
-      #"../components/components.gyp:usb_service",  TODO(GYP)
-      #"../components/components.gyp:web_modal",  TODO(GYP)
+      "//components/feedback",
+      "//components/storage_monitor",
+      "//components/usb_service",
+      "//components/web_modal",
     ]
   } else {
     sources += rebase_path(gypi_values.chrome_browser_non_android_sources,

chrome/browser/ui/BUILD.gn

@@ -43,6 +43,7 @@ static_library("ui") {
     "//components/dom_distiller/core",
     "//components/dom_distiller/webui",
     "//components/feedback/proto",
+    "//components/onc",
     "//components/resources",
     "//components/strings",
     "//content/public/browser",
@@ -68,7 +69,6 @@ static_library("ui") {
     #'../components/components.gyp:auto_login_parser',  TODO(GYP)
     #'../components/components.gyp:invalidation',  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)
     #'../ui/message_center/message_center.gyp:message_center',  TODO(GYP)
   ]
@@ -87,6 +87,8 @@ static_library("ui") {
       "//chrome/browser/ui/webui/omnibox:mojo_bindings",
       "//chrome/common/extensions/api:api",
       "//components/autofill/content/browser:risk_proto",
+      "//device/bluetooth",
+      "//device/nfc",
       "//mojo/system",
       "//net:net_with_v8",
       "//third_party/adobe/flash:flapper_version_h",
@@ -104,8 +106,6 @@ static_library("ui") {
       "//webkit/common:storage",
       #'debugger',  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)
       #'../third_party/libjingle/libjingle.gyp:libjingle',  TODO(GYP)
       #'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',  TODO(GYP)

components/BUILD.gn

@@ -25,6 +25,7 @@ group("all_components") {
     "//components/favicon/core",
     "//components/favicon_base",
     "//components/feedback",
+    "//components/gcm_driver",
     "//components/history/core/browser",
     "//components/history/core/common",
     "//components/history/core/test",
@@ -44,6 +45,7 @@ group("all_components") {
     "//components/rappor",
     "//components/resources:components_resources",
     "//components/search_engines",
+    "//components/signin/core/browser",
     "//components/startup_metric_utils",
     "//components/strings",
     "//components/tracing",
@@ -89,6 +91,7 @@ group("all_components") {
       "//components/favicon_base",  # Should work, needs checking.
       "//components/favicon/core",  # Blocked on keyed service.
       "//components/feedback",  # Blocked on content.
+      "//components/gcm_driver",  # 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.
@@ -99,6 +102,7 @@ group("all_components") {
       "//components/policy",  # Blocked on content (indirectly via autofill).
       "//components/rappor",  # 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/common",  # Blocked on content.
       "//components/translate/content/renderer",  # Blocked on content.

components/gcm_driver.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/gcm_driver
       'target_name': 'gcm_driver',
       'type': 'static_library',
       'dependencies': [
@@ -17,6 +18,7 @@
         '..',
       ],
       'sources': [
+         # Note: file list duplicated in GN build.
         'gcm_driver/android/component_jni_registrar.cc',
         'gcm_driver/android/component_jni_registrar.h',
         'gcm_driver/default_gcm_app_handler.cc',
@@ -64,6 +66,7 @@
       ],
     },
     {
+      # GN version: //components/gcm_driver:test_support
       'target_name': 'gcm_driver_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -76,6 +79,7 @@
         '..',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'gcm_driver/fake_gcm_app_handler.cc',
         'gcm_driver/fake_gcm_app_handler.h',
         'gcm_driver/fake_gcm_client.cc',

components/gcm_driver/BUILD.gn

@@ -0,0 +1,86 @@
+# 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

components/signin.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/signin/core/common
       'target_name': 'signin_core_common',
       'type': 'static_library',
       'include_dirs': [
@@ -20,6 +21,7 @@
       ],
     },
     {
+      # GN version: //components/signin/core/browser
       'target_name': 'signin_core_browser',
       'type': 'static_library',
       'dependencies': [
@@ -39,6 +41,7 @@
         '..',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'signin/core/browser/about_signin_internals.cc',
         'signin/core/browser/about_signin_internals.h',
         'signin/core/browser/account_reconcilor.cc',
@@ -91,6 +94,7 @@
       'msvs_disabled_warnings': [4267, ],
     },
     {
+      # GN version: //components/signin/core/browser:test_support
       'target_name': 'signin_core_browser_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -101,6 +105,7 @@
         '..',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'signin/core/browser/fake_auth_status_provider.cc',
         'signin/core/browser/fake_auth_status_provider.h',
         'signin/core/browser/test_signin_client.cc',
@@ -112,6 +117,7 @@
     ['OS == "ios"', {
       'targets': [
         {
+          # GN version: //components/signin/core/browser:ios
           'target_name': 'signin_ios_browser',
           'type': 'static_library',
           'dependencies': [
@@ -122,6 +128,7 @@
             '..',
           ],
           '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.mm',
           ],