Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: extensions/extensions.gyp

Issue 50743005: Moved extension_api to src/extensions/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/extension_api_stub.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index e54d9651aec2d8c17d77c8bfbf7e0fcfc8272491..f58a4425ad97f7eaa2cba58d8e24078dd7aaa0f4 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',
« no previous file with comments | « extensions/common/extension_api_stub.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698