| Index: extensions/extensions.gyp
|
| diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
|
| index cd8a01afd418db9d6f23065185eb7decdecd25b2..cbe77a1afbf9011188f5729a444d07c669ebb468 100644
|
| --- a/extensions/extensions.gyp
|
| +++ b/extensions/extensions.gyp
|
| @@ -11,12 +11,11 @@
|
| 'target_name': 'extensions_common',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'common/api/api.gyp:extensions_api',
|
| # TODO(benwells): figure out what to do with the api target and
|
| # api resources compiled into the chrome resource bundle.
|
| # http://crbug.com/162530
|
| '../chrome/chrome_resources.gyp:chrome_resources',
|
| - # TODO(jamescook|derat): Pull strings into extensions module.
|
| + # TODO(jamescook|derat): Pull all strings into extensions module.
|
| '../chrome/chrome_resources.gyp:chrome_strings',
|
| # Need default icons in theme_resources.grd
|
| '../chrome/chrome_resources.gyp:theme_resources',
|
| @@ -33,6 +32,8 @@
|
| '../ui/base/ui_base.gyp:ui_base',
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| '../url/url.gyp:url_lib',
|
| + 'common/api/api.gyp:extensions_api',
|
| + 'extensions_strings.gyp:extensions_strings',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -215,14 +216,15 @@
|
| 'target_name': 'extensions_browser',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'extensions_common',
|
| - 'common/api/api.gyp:extensions_api',
|
| # TODO(jamescook|derat): Pull strings into extensions module.
|
| '../chrome/chrome_resources.gyp:chrome_strings',
|
| '../components/components.gyp:keyed_service_content',
|
| '../content/content.gyp:content_browser',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| + 'common/api/api.gyp:extensions_api',
|
| + 'extensions_common',
|
| + 'extensions_strings.gyp:extensions_strings',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -439,10 +441,10 @@
|
| 'target_name': 'extensions_test_support',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'extensions_browser',
|
| - 'extensions_common',
|
| '../base/base.gyp:base',
|
| '../testing/gtest.gyp:gtest',
|
| + 'extensions_browser',
|
| + 'extensions_common',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -475,8 +477,10 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../base/base.gyp:test_support_base',
|
| + '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| 'extensions_common',
|
| + 'extensions_strings.gyp:extensions_strings',
|
| 'extensions_test_support',
|
| ],
|
| 'sources': [
|
|
|