diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
| commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
| tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /extensions/extensions.gyp | |
| parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
| download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index e54d9651ae..f58a4425ad 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -11,6 +11,11 @@ 'target_name': 'extensions_common', 'type': 'static_library', 'dependencies': [ + # 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', + '../chrome/common/extensions/api/api.gyp:api', '../content/content.gyp:content_common', '../third_party/re2/re2.gyp:re2', ], @@ -31,6 +36,9 @@ 'common/event_filtering_info.h', 'common/event_matcher.cc', 'common/event_matcher.h', + 'common/extension_api.cc', + 'common/extension_api.h', + 'common/extension_api_stub.cc', 'common/extension_paths.cc', 'common/extension_paths.h', 'common/extension_resource.cc', @@ -95,6 +103,17 @@ ], # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], + 'conditions': [ + ['enable_extensions==1', { + 'sources!': [ + 'common/extension_api_stub.cc', + ], + }, { # enable_extensions == 0 + 'sources!': [ + 'common/extension_api.cc', + ], + }], + ], }, { 'target_name': 'extensions_browser', |