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

Side by Side Diff: extensions/extensions.gyp

Issue 506253003: Revert "Split bundle generation steps so that API registration is generated in browser, not common." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/common/api/schemas.gypi ('k') | extensions/generated_extensions_api.gni » ('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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 '../base/base.gyp:base_prefs', 255 '../base/base.gyp:base_prefs',
256 '../components/components.gyp:keyed_service_content', 256 '../components/components.gyp:keyed_service_content',
257 '../components/components.gyp:keyed_service_core', 257 '../components/components.gyp:keyed_service_core',
258 '../components/components.gyp:pref_registry', 258 '../components/components.gyp:pref_registry',
259 '../components/components.gyp:usb_service', 259 '../components/components.gyp:usb_service',
260 '../components/components.gyp:web_modal', 260 '../components/components.gyp:web_modal',
261 '../content/content.gyp:content_browser', 261 '../content/content.gyp:content_browser',
262 '../device/serial/serial.gyp:device_serial', 262 '../device/serial/serial.gyp:device_serial',
263 '../skia/skia.gyp:skia', 263 '../skia/skia.gyp:skia',
264 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 264 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
265 'browser/api/api_registration.gyp:extensions_api_registration',
266 'cast_channel_proto', 265 'cast_channel_proto',
267 'common/api/api.gyp:extensions_api', 266 'common/api/api.gyp:extensions_api',
268 'extensions_common', 267 'extensions_common',
269 'extensions_strings.gyp:extensions_strings', 268 'extensions_strings.gyp:extensions_strings',
270 ], 269 ],
271 'include_dirs': [ 270 'include_dirs': [
272 '..', 271 '..',
273 '<(INTERMEDIATE_DIR)', 272 '<(INTERMEDIATE_DIR)',
274 # Needed to access generated API headers. 273 # Needed to access generated API headers.
275 '<(SHARED_INTERMEDIATE_DIR)', 274 '<(SHARED_INTERMEDIATE_DIR)',
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 ] 763 ]
765 }, 764 },
766 { 765 {
767 # GN version: //extensions:test_support 766 # GN version: //extensions:test_support
768 'target_name': 'extensions_test_support', 767 'target_name': 'extensions_test_support',
769 'type': 'static_library', 768 'type': 'static_library',
770 'dependencies': [ 769 'dependencies': [
771 '../base/base.gyp:base', 770 '../base/base.gyp:base',
772 '../net/net.gyp:net_test_support', 771 '../net/net.gyp:net_test_support',
773 '../testing/gtest.gyp:gtest', 772 '../testing/gtest.gyp:gtest',
774 'browser/api/api_registration.gyp:extensions_api_registration',
775 'common/api/api.gyp:extensions_api', 773 'common/api/api.gyp:extensions_api',
776 'extensions_browser', 774 'extensions_browser',
777 'extensions_common', 775 'extensions_common',
778 'extensions_resources.gyp:extensions_resources', 776 'extensions_resources.gyp:extensions_resources',
779 ], 777 ],
780 'include_dirs': [ 778 'include_dirs': [
781 '..', 779 '..',
782 '<(SHARED_INTERMEDIATE_DIR)', 780 '<(SHARED_INTERMEDIATE_DIR)',
783 ], 781 ],
784 'sources': [ 782 'sources': [
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 'browser/api/cast_channel/logging.proto' 974 'browser/api/cast_channel/logging.proto'
977 ], 975 ],
978 'variables': { 976 'variables': {
979 'proto_in_dir': 'browser/api/cast_channel', 977 'proto_in_dir': 'browser/api/cast_channel',
980 'proto_out_dir': 'extensions/browser/api/cast_channel', 978 'proto_out_dir': 'extensions/browser/api/cast_channel',
981 }, 979 },
982 'includes': [ '../build/protoc.gypi' ] 980 'includes': [ '../build/protoc.gypi' ]
983 }, 981 },
984 ] 982 ]
985 } 983 }
OLDNEW
« no previous file with comments | « extensions/common/api/schemas.gypi ('k') | extensions/generated_extensions_api.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698