Index: chrome/chrome_common.gypi |
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi |
index c19dd675d276245fea66722589980455676051ba..5dfa4215c8181819bb4a718469995e73e858b0e2 100644 |
--- a/chrome/chrome_common.gypi |
+++ b/chrome/chrome_common.gypi |
@@ -53,30 +53,14 @@ |
'common/custom_handlers/protocol_handler.cc', |
'common/custom_handlers/protocol_handler.h', |
'common/descriptors_android.h', |
- 'common/extensions/api/extension_action/action_info.cc', |
- 'common/extensions/api/extension_action/action_info.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/plugins/plugins_handler.cc', |
- 'common/extensions/api/plugins/plugins_handler.h', |
- 'common/extensions/api/storage/storage_schema_manifest_handler.cc', |
- 'common/extensions/api/storage/storage_schema_manifest_handler.h', |
- 'common/extensions/api/supervised_user_private/supervised_user_handler.cc', |
- 'common/extensions/api/supervised_user_private/supervised_user_handler.h', |
'common/extensions/chrome_extension_messages.h', |
'common/extensions/chrome_extensions_client.cc', |
'common/extensions/chrome_extensions_client.h', |
- 'common/extensions/chrome_manifest_handlers.cc', |
- 'common/extensions/chrome_manifest_handlers.h', |
'common/extensions/chrome_utility_extensions_messages.h', |
'common/extensions/command.cc', |
'common/extensions/command.h', |
'common/extensions/extension_constants.cc', |
'common/extensions/extension_constants.h', |
- 'common/extensions/extension_file_util.cc', |
- 'common/extensions/extension_file_util.h', |
'common/extensions/extension_process_policy.cc', |
'common/extensions/extension_process_policy.h', |
'common/extensions/features/chrome_channel_feature_filter.cc', |
@@ -85,28 +69,6 @@ |
'common/extensions/features/feature_channel.h', |
'common/extensions/image_writer/image_writer_util_mac.cc', |
'common/extensions/image_writer/image_writer_util_mac.h', |
- 'common/extensions/manifest_handlers/app_isolation_info.cc', |
- 'common/extensions/manifest_handlers/app_isolation_info.h', |
- 'common/extensions/manifest_handlers/app_launch_info.cc', |
- 'common/extensions/manifest_handlers/app_launch_info.h', |
- 'common/extensions/manifest_handlers/automation.h', |
- 'common/extensions/manifest_handlers/automation.cc', |
- 'common/extensions/manifest_handlers/content_scripts_handler.cc', |
- 'common/extensions/manifest_handlers/content_scripts_handler.h', |
- 'common/extensions/manifest_handlers/mime_types_handler.cc', |
- 'common/extensions/manifest_handlers/mime_types_handler.h', |
- 'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc', |
- 'common/extensions/manifest_handlers/minimum_chrome_version_checker.h', |
- 'common/extensions/manifest_handlers/settings_overrides_handler.cc', |
- 'common/extensions/manifest_handlers/settings_overrides_handler.h', |
- 'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc', |
- 'common/extensions/manifest_handlers/synthesize_browser_action_handler.h', |
- 'common/extensions/manifest_handlers/theme_handler.cc', |
- 'common/extensions/manifest_handlers/theme_handler.h', |
- 'common/extensions/manifest_handlers/ui_overrides_handler.cc', |
- 'common/extensions/manifest_handlers/ui_overrides_handler.h', |
- 'common/extensions/manifest_url_handler.cc', |
- 'common/extensions/manifest_url_handler.h', |
'common/extensions/permissions/chrome_api_permissions.cc', |
'common/extensions/permissions/chrome_api_permissions.h', |
'common/extensions/permissions/chrome_permission_message_provider.cc', |
@@ -188,28 +150,66 @@ |
'chrome_common_extensions_sources': [ |
'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/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/supervised_user_private/supervised_user_handler.cc', |
+ 'common/extensions/api/supervised_user_private/supervised_user_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_manifest_handlers.cc', |
+ 'common/extensions/chrome_manifest_handlers.h', |
+ 'common/extensions/extension_file_util.cc', |
+ 'common/extensions/extension_file_util.h', |
+ 'common/extensions/manifest_handlers/app_isolation_info.cc', |
+ 'common/extensions/manifest_handlers/app_isolation_info.h', |
+ 'common/extensions/manifest_handlers/app_launch_info.cc', |
+ 'common/extensions/manifest_handlers/app_launch_info.h', |
+ 'common/extensions/manifest_handlers/automation.cc', |
+ 'common/extensions/manifest_handlers/automation.h', |
+ 'common/extensions/manifest_handlers/content_scripts_handler.cc', |
+ 'common/extensions/manifest_handlers/content_scripts_handler.h', |
+ 'common/extensions/manifest_handlers/mime_types_handler.cc', |
+ 'common/extensions/manifest_handlers/mime_types_handler.h', |
+ 'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc', |
+ 'common/extensions/manifest_handlers/minimum_chrome_version_checker.h', |
+ 'common/extensions/manifest_handlers/settings_overrides_handler.cc', |
+ 'common/extensions/manifest_handlers/settings_overrides_handler.h', |
+ 'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc', |
+ 'common/extensions/manifest_handlers/synthesize_browser_action_handler.h', |
+ 'common/extensions/manifest_handlers/theme_handler.cc', |
+ 'common/extensions/manifest_handlers/theme_handler.h', |
+ 'common/extensions/manifest_handlers/ui_overrides_handler.cc', |
+ 'common/extensions/manifest_handlers/ui_overrides_handler.h', |
+ 'common/extensions/manifest_url_handler.cc', |
+ 'common/extensions/manifest_url_handler.h', |
], |
'chrome_common_full_safe_browsing_sources': [ |
'common/safe_browsing/download_protection_util.cc', |
@@ -336,7 +336,8 @@ |
['enable_extensions==1', { |
'sources': [ '<@(chrome_common_extensions_sources)' ], |
'dependencies': [ |
- '../device/usb/usb.gyp:device_usb', |
+ '<(DEPTH)/device/usb/usb.gyp:device_usb', |
+ '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', |
], |
}], |
['OS=="win" or OS=="mac"', { |
@@ -361,7 +362,6 @@ |
'<(DEPTH)/components/components.gyp:signin_core_common', |
'<(DEPTH)/components/components.gyp:translate_content_common', |
'<(DEPTH)/components/components.gyp:visitedlink_common', |
- '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', |
'<(DEPTH)/extensions/extensions.gyp:extensions_common', |
'<(DEPTH)/ipc/ipc.gyp:ipc', |
'<(DEPTH)/third_party/re2/re2.gyp:re2', |