Index: chrome/chrome_common.gypi |
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi |
index 689b26976e2e7b3a8302933a99c1b6ee6261a688..4125a86dadaef145f18fb6d4b7a1680eba07590c 100644 |
--- 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': [ |