Work toward a chrome/common GN target.

This adds more of the chrome/common target. The sources don't all compile yet so this is commented out. Add many resources targets required my chrome/common. R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/348663003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278586 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Jun 20, 2014 · 7f2b78e · 7f2b78e
1 parent 89e4b74
commit 7f2b78e
Show file tree

Hide file tree

Showing 12 changed files with 236 additions and 55 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -21,7 +21,7 @@ group("root") {
 
     "//apps/common/api:apps_api",
     "//cc",
-    "//chrome:resources",
+    "//chrome/common",
     "//components/favicon_base",
     "//components/language_usage_metrics",
     "//components/metrics",
@@ -142,6 +142,7 @@ group("root") {
   if (is_android) {
     deps -= [
       "//cc",
+      "//chrome/common",  # Blocked on content.
       "//content",
       "//components/keyed_service/content",  # Blocked on content.
       "//components/user_prefs",  # Blocked on content.

diff --git a/build/gypi_to_gn.py b/build/gypi_to_gn.py
@@ -96,6 +96,11 @@ def LoadPythonDictionary(path):
   if 'target_conditions' in file_data:
     del file_data['target_conditions']
 
+  # Strip targets in the toplevel, since some files define these and we can't
+  # slurp them in.
+  if 'targets' in file_data:
+    del file_data['targets']
+
   return file_data
 
 

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -19,3 +19,13 @@ group("resources") {
     deps += [ "//chrome/common:extensions_api_resources" ]
   }
 }
+
+# GYP version: chrome/chrome_resources.gyp:chrome_strings
+group("strings") {
+  deps = [
+    "//chrome/app:chromium_strings",
+    "//chrome/app:generated_resources",
+    "//chrome/app:google_chrome_strings",
+    "//chrome/app/resources:locale_settings",
+  ]
+}
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
@@ -0,0 +1,23 @@
+# 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")
+
+# GYP version: chrome/chrome_resources.gyp:chrome_strings
+#              (generate_generated_resources action)
+grit("generated_resources") {
+  source = "generated_resources.grd"
+}
+
+# GYP version: chrome/chrome_resources.gyp:chrome_strings
+#              (generate_google_chrome_strings action)
+grit("google_chrome_strings") {
+  source = "google_chrome_strings.grd"
+}
+
+# GYP version: chrome/chrome_resources.gyp:chrome_strings
+#              (generate_chromium_strings action)
+grit("chromium_strings") {
+  source = "chromium_strings.grd"
+}
diff --git a/chrome/app/resources/BUILD.gn b/chrome/app/resources/BUILD.gn
@@ -0,0 +1,11 @@
+# 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")
+
+# GYP version: chrome/chrome_resources.gyp:chrome_strings
+#              (generate_locale_settings action)
+grit("locale_settings") {
+  source = "locale_settings.grd"
+}
diff --git a/chrome/app/theme/BUILD.gn b/chrome/app/theme/BUILD.gn
@@ -0,0 +1,10 @@
+# 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")
+
+# GYP version: chrome/chrome_resources.gyp:theme_resources
+grit("theme_resources") {
+  source = "theme_resources.grd"
+}
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
@@ -60,48 +60,18 @@
       'common/custom_handlers/protocol_handler.cc',
       'common/custom_handlers/protocol_handler.h',
       'common/descriptors_android.h',
-      'common/extensions/api/bluetooth/bluetooth_manifest_data.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_data.h',
-      'common/extensions/api/bluetooth/bluetooth_manifest_handler.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_handler.h',
-      'common/extensions/api/bluetooth/bluetooth_manifest_permission.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_permission.h',
-      'common/extensions/api/commands/commands_handler.cc',
-      'common/extensions/api/commands/commands_handler.h',
       'common/extensions/api/extension_action/action_info.cc',
       'common/extensions/api/extension_action/action_info.h',
-      'common/extensions/api/extension_action/browser_action_handler.cc',
-      'common/extensions/api/extension_action/browser_action_handler.h',
-      'common/extensions/api/extension_action/page_action_handler.cc',
-      'common/extensions/api/extension_action/page_action_handler.h',
-      'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
-      'common/extensions/api/file_browser_handlers/file_browser_handler.h',
       'common/extensions/api/i18n/default_locale_handler.cc',
       'common/extensions/api/i18n/default_locale_handler.h',
       'common/extensions/api/identity/oauth2_manifest_handler.cc',
       'common/extensions/api/identity/oauth2_manifest_handler.h',
-      'common/extensions/api/input_ime/input_components_handler.cc',
-      'common/extensions/api/input_ime/input_components_handler.h',
       'common/extensions/api/managed_mode_private/managed_mode_handler.cc',
       'common/extensions/api/managed_mode_private/managed_mode_handler.h',
-      'common/extensions/api/notifications/notification_style.cc',
-      'common/extensions/api/notifications/notification_style.h',
-      'common/extensions/api/omnibox/omnibox_handler.cc',
-      'common/extensions/api/omnibox/omnibox_handler.h',
       'common/extensions/api/plugins/plugins_handler.cc',
       'common/extensions/api/plugins/plugins_handler.h',
-      'common/extensions/api/speech/tts_engine_manifest_handler.cc',
-      'common/extensions/api/speech/tts_engine_manifest_handler.h',
-      'common/extensions/api/spellcheck/spellcheck_handler.cc',
-      'common/extensions/api/spellcheck/spellcheck_handler.h',
       'common/extensions/api/storage/storage_schema_manifest_handler.cc',
       'common/extensions/api/storage/storage_schema_manifest_handler.h',
-      'common/extensions/api/system_indicator/system_indicator_handler.cc',
-      'common/extensions/api/system_indicator/system_indicator_handler.h',
-      'common/extensions/api/url_handlers/url_handlers_parser.cc',
-      'common/extensions/api/url_handlers/url_handlers_parser.h',
-      'common/extensions/api/webstore/webstore_api_constants.cc',
-      'common/extensions/api/webstore/webstore_api_constants.h',
       'common/extensions/chrome_extension_messages.h',
       'common/extensions/chrome_extensions_client.cc',
       'common/extensions/chrome_extensions_client.h',
@@ -259,6 +229,38 @@
       'common/worker_thread_ticker.cc',
       'common/worker_thread_ticker.h',
     ],
+    'chrome_common_extensions_sources': [
+      'common/extensions/api/bluetooth/bluetooth_manifest_data.cc',
+      'common/extensions/api/bluetooth/bluetooth_manifest_data.h',
+      'common/extensions/api/bluetooth/bluetooth_manifest_handler.cc',
+      'common/extensions/api/bluetooth/bluetooth_manifest_handler.h',
+      'common/extensions/api/bluetooth/bluetooth_manifest_permission.cc',
+      'common/extensions/api/bluetooth/bluetooth_manifest_permission.h',
+      'common/extensions/api/commands/commands_handler.cc',
+      'common/extensions/api/commands/commands_handler.h',
+      'common/extensions/api/extension_action/browser_action_handler.cc',
+      'common/extensions/api/extension_action/browser_action_handler.h',
+      'common/extensions/api/extension_action/page_action_handler.cc',
+      'common/extensions/api/extension_action/page_action_handler.h',
+      'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
+      'common/extensions/api/file_browser_handlers/file_browser_handler.h',
+      'common/extensions/api/input_ime/input_components_handler.cc',
+      'common/extensions/api/input_ime/input_components_handler.h',
+      'common/extensions/api/notifications/notification_style.cc',
+      'common/extensions/api/notifications/notification_style.h',
+      'common/extensions/api/omnibox/omnibox_handler.cc',
+      'common/extensions/api/omnibox/omnibox_handler.h',
+      'common/extensions/api/speech/tts_engine_manifest_handler.cc',
+      'common/extensions/api/speech/tts_engine_manifest_handler.h',
+      'common/extensions/api/spellcheck/spellcheck_handler.cc',
+      'common/extensions/api/spellcheck/spellcheck_handler.h',
+      'common/extensions/api/system_indicator/system_indicator_handler.cc',
+      'common/extensions/api/system_indicator/system_indicator_handler.h',
+      'common/extensions/api/url_handlers/url_handlers_parser.cc',
+      'common/extensions/api/url_handlers/url_handlers_parser.h',
+      'common/extensions/api/webstore/webstore_api_constants.cc',
+      'common/extensions/api/webstore/webstore_api_constants.h',
+    ],
   },
   'targets': [
     {
@@ -319,26 +321,13 @@
       ],
       'conditions': [
         ['enable_extensions==1', {
+          'sources': [
+            '<@(chrome_common_extensions_sources)',
+          ],
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../device/usb/usb.gyp:device_usb',
           ],
-        }, {  # enable_extensions == 0
-          'sources/': [
-            ['exclude', '^common/extensions/api/'],
-            ['include', 'common/extensions/api/extension_action/action_info.cc'],
-            ['include', 'common/extensions/api/extension_action/action_info.h'],
-            ['include', 'common/extensions/api/i18n/default_locale_handler.cc'],
-            ['include', 'common/extensions/api/i18n/default_locale_handler.h'],
-            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.cc'],
-            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.h'],
-            ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.cc'],
-            ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.h'],
-            ['include', 'common/extensions/api/plugins/plugins_handler.cc'],
-            ['include', 'common/extensions/api/plugins/plugins_handler.h'],
-            ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.cc'],
-            ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.h'],
-          ],
         }],
         ['OS=="win" or OS=="mac"', {
           'sources': [
@@ -585,7 +574,7 @@
       ],
     },
     {
-      # GN version: //chrome/commoon/net:net
+      # GN version: //chrome/common/net:net
       'target_name': 'common_net',
       'type': 'static_library',
       'sources': [

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
@@ -167,7 +167,7 @@
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
-
+      #
       # GN version: //chrome:resources
       'target_name': 'chrome_resources',
       'type': 'none',
@@ -228,31 +228,37 @@
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
+      #
+      # GN version: //chrome:strings
       'target_name': 'chrome_strings',
       'type': 'none',
       'actions': [
         {
+          # GN version: //chrome/app/resources:locale_settings
           'action_name': 'generate_locale_settings',
           'variables': {
             'grit_grd_file': 'app/resources/locale_settings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
+          # GN version: //chrome/app:chromium_strings
           'action_name': 'generate_chromium_strings',
           'variables': {
             'grit_grd_file': 'app/chromium_strings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
+          # GN version: //chrome/app:generated_resources
           'action_name': 'generate_generated_resources',
           'variables': {
             'grit_grd_file': 'app/generated_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
+          # GN version: //chrome/app:google_chrome_strings
           'action_name': 'generate_google_chrome_strings',
           'variables': {
             'grit_grd_file': 'app/google_chrome_strings.grd',
@@ -334,6 +340,7 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
+      # GN version: //chrome/app/theme:theme_resources
       'target_name': 'theme_resources',
       'type': 'none',
       'dependencies': [