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 /chrome/chrome_common.gypi | |
| 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 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4a9ecb194e..7ee159104b 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -127,9 +127,6 @@ 'common/extensions/api/extension_action/page_action_handler.h', 'common/extensions/api/extension_action/script_badge_handler.cc', 'common/extensions/api/extension_action/script_badge_handler.h', - 'common/extensions/api/extension_api.cc', - 'common/extensions/api/extension_api.h', - 'common/extensions/api/extension_api_stub.cc', 'common/extensions/api/file_browser_handlers/file_browser_handler.cc', 'common/extensions/api/file_browser_handlers/file_browser_handler.h', 'common/extensions/api/file_handlers/file_handlers_parser.cc', @@ -414,9 +411,6 @@ ], 'conditions': [ ['enable_extensions==1', { - 'sources!': [ - 'common/extensions/api/extension_api_stub.cc', - ], 'dependencies': [ '../device/bluetooth/bluetooth.gyp:device_bluetooth', '../device/usb/usb.gyp:device_usb', @@ -424,7 +418,6 @@ }, { # enable_extensions == 0 'sources/': [ ['exclude', '^common/extensions/api/'], - ['include', 'common/extensions/api/extension_api_stub.cc'], ['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'], @@ -457,7 +450,6 @@ ['OS != "ios"', { 'dependencies': [ '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy', - '<(DEPTH)/chrome/common/extensions/api/api.gyp:api', '<(DEPTH)/components/components.gyp:autofill_core_common', '<(DEPTH)/components/nacl_common.gyp:nacl_common', '<(DEPTH)/ipc/ipc.gyp:ipc', |