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

Side by Side Diff: extensions/extensions.gyp

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « extensions/browser/api/usb_private/usb_private_api.cc ('k') | extensions/shell/browser/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 # GN version: //extensions/browser 263 # GN version: //extensions/browser
264 'target_name': 'extensions_browser', 264 'target_name': 'extensions_browser',
265 'type': 'static_library', 265 'type': 'static_library',
266 'dependencies': [ 266 'dependencies': [
267 '../base/base.gyp:base', 267 '../base/base.gyp:base',
268 '../base/base.gyp:base_prefs', 268 '../base/base.gyp:base_prefs',
269 '../components/components.gyp:keyed_service_content', 269 '../components/components.gyp:keyed_service_content',
270 '../components/components.gyp:keyed_service_core', 270 '../components/components.gyp:keyed_service_core',
271 '../components/components.gyp:pref_registry', 271 '../components/components.gyp:pref_registry',
272 '../components/components.gyp:sessions', 272 '../components/components.gyp:sessions',
273 '../components/components.gyp:usb_service',
274 '../components/components.gyp:web_modal', 273 '../components/components.gyp:web_modal',
275 '../content/content.gyp:content_browser', 274 '../content/content.gyp:content_browser',
276 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 275 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
277 '../device/serial/serial.gyp:device_serial', 276 '../device/serial/serial.gyp:device_serial',
278 '../skia/skia.gyp:skia', 277 '../skia/skia.gyp:skia',
279 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 278 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
280 'browser/api/api_registration.gyp:extensions_api_registration', 279 'browser/api/api_registration.gyp:extensions_api_registration',
281 'cast_channel_proto', 280 'cast_channel_proto',
282 'common/api/api.gyp:extensions_api', 281 'common/api/api.gyp:extensions_api',
283 'extensions_common', 282 'extensions_common',
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 ['enable_extensions==0', { 615 ['enable_extensions==0', {
617 # Exclude all API implementations and the ExtensionsApiClient 616 # Exclude all API implementations and the ExtensionsApiClient
618 # interface. Moving an API from src/chrome to src/extensions implies 617 # interface. Moving an API from src/chrome to src/extensions implies
619 # it can be cleanly disabled with enable_extensions==0. 618 # it can be cleanly disabled with enable_extensions==0.
620 # TODO: Eventually the entire extensions module should not be built 619 # TODO: Eventually the entire extensions module should not be built
621 # when enable_extensions==0. 620 # when enable_extensions==0.
622 'sources/': [ 621 'sources/': [
623 ['exclude', '^browser/'], 622 ['exclude', '^browser/'],
624 ], 623 ],
625 'dependencies!': [ 624 'dependencies!': [
626 '../components/components.gyp:usb_service',
627 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 625 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
628 '../device/serial/serial.gyp:device_serial', 626 '../device/serial/serial.gyp:device_serial',
629 ], 627 ],
630 }], 628 }],
631 ['use_openssl==1', { 629 ['use_openssl==1', {
632 'sources': [ 630 'sources': [
633 'browser/api/cast_channel/cast_auth_util_openssl.cc', 631 'browser/api/cast_channel/cast_auth_util_openssl.cc',
634 ], 632 ],
635 }, { 633 }, {
636 'sources': [ 634 'sources': [
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 'browser/api/cast_channel/logging.proto' 1043 'browser/api/cast_channel/logging.proto'
1046 ], 1044 ],
1047 'variables': { 1045 'variables': {
1048 'proto_in_dir': 'browser/api/cast_channel', 1046 'proto_in_dir': 'browser/api/cast_channel',
1049 'proto_out_dir': 'extensions/browser/api/cast_channel', 1047 'proto_out_dir': 'extensions/browser/api/cast_channel',
1050 }, 1048 },
1051 'includes': [ '../build/protoc.gypi' ] 1049 'includes': [ '../build/protoc.gypi' ]
1052 }, 1050 },
1053 ] 1051 ]
1054 } 1052 }
OLDNEW
« no previous file with comments | « extensions/browser/api/usb_private/usb_private_api.cc ('k') | extensions/shell/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698