diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
| commit | 4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch) | |
| tree | b98c2a945dbec61aeb9edef5e371f905e7ab5b37 /chrome/chrome_common.gypi | |
| parent | e92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff) | |
| download | chromium_org-4ad1aa43a48567659193a298fad74f55e00b3dd9.tar.gz | |
Merge from Chromium at DEPS revision 260540
This commit was generated by merge_to_master.py.
Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index a8e1d43c4d..4c2821edfe 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -145,12 +145,6 @@ 'common/extensions/api/omnibox/omnibox_handler.h', 'common/extensions/api/plugins/plugins_handler.cc', 'common/extensions/api/plugins/plugins_handler.h', - 'common/extensions/api/sockets/sockets_manifest_handler.cc', - 'common/extensions/api/sockets/sockets_manifest_handler.h', - 'common/extensions/api/sockets/sockets_manifest_data.cc', - 'common/extensions/api/sockets/sockets_manifest_data.h', - 'common/extensions/api/sockets/sockets_manifest_permission.cc', - 'common/extensions/api/sockets/sockets_manifest_permission.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', @@ -398,7 +392,7 @@ }], ['OS != "ios"', { 'dependencies': [ - '<(DEPTH)/third_party/re2/re2.gyp:re2', + '<(DEPTH)/apps/common/api/api.gyp:apps_api', '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', '<(DEPTH)/components/components.gyp:autofill_core_common', '<(DEPTH)/components/components.gyp:autofill_content_common', @@ -410,6 +404,7 @@ '<(DEPTH)/extensions/extensions.gyp:extensions_common', '<(DEPTH)/ipc/ipc.gyp:ipc', '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h', + '<(DEPTH)/third_party/re2/re2.gyp:re2', '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', ], 'export_dependent_settings': [ |