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

Side by Side Diff: chrome/chrome_browser_extensions.gypi

Issue 215633004: Fix chrome_api and extensions_api gyp dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/chrome_common.gypi » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser_extensions', 8 'target_name': 'browser_extensions',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 21 matching lines...) Expand all
32 '../components/components.gyp:onc_component', 32 '../components/components.gyp:onc_component',
33 '../components/components.gyp:url_matcher', 33 '../components/components.gyp:url_matcher',
34 '../components/components.gyp:wifi_component', 34 '../components/components.gyp:wifi_component',
35 '../components/components_strings.gyp:components_strings', 35 '../components/components_strings.gyp:components_strings',
36 '../content/content.gyp:content_browser', 36 '../content/content.gyp:content_browser',
37 '../content/content.gyp:content_common', 37 '../content/content.gyp:content_common',
38 '../crypto/crypto.gyp:crypto', 38 '../crypto/crypto.gyp:crypto',
39 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 39 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
40 '../device/hid/hid.gyp:device_hid', 40 '../device/hid/hid.gyp:device_hid',
41 '../device/serial/serial.gyp:device_serial', 41 '../device/serial/serial.gyp:device_serial',
42 '../extensions/common/api/api.gyp:extensions_api',
42 '../extensions/extensions.gyp:extensions_browser', 43 '../extensions/extensions.gyp:extensions_browser',
43 '../net/net.gyp:net', 44 '../net/net.gyp:net',
44 '../skia/skia.gyp:skia', 45 '../skia/skia.gyp:skia',
45 '../sync/sync.gyp:sync', 46 '../sync/sync.gyp:sync',
46 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 47 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
47 '../third_party/icu/icu.gyp:icui18n', 48 '../third_party/icu/icu.gyp:icui18n',
48 '../third_party/icu/icu.gyp:icuuc', 49 '../third_party/icu/icu.gyp:icuuc',
49 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 50 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
50 '../third_party/libusb/libusb.gyp:libusb', 51 '../third_party/libusb/libusb.gyp:libusb',
51 '../third_party/webrtc/modules/modules.gyp:desktop_capture', 52 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
52 '../ui/accessibility/accessibility.gyp:ax_gen', 53 '../ui/accessibility/accessibility.gyp:ax_gen',
53 '../ui/base/strings/ui_strings.gyp:ui_strings', 54 '../ui/base/strings/ui_strings.gyp:ui_strings',
54 '../ui/base/ui_base.gyp:ui_base', 55 '../ui/base/ui_base.gyp:ui_base',
55 '../ui/gfx/gfx.gyp:gfx', 56 '../ui/gfx/gfx.gyp:gfx',
56 '../ui/gfx/gfx.gyp:gfx_geometry', 57 '../ui/gfx/gfx.gyp:gfx_geometry',
57 '../ui/resources/ui_resources.gyp:ui_resources', 58 '../ui/resources/ui_resources.gyp:ui_resources',
58 '../url/url.gyp:url_lib', 59 '../url/url.gyp:url_lib',
59 '../webkit/storage_browser.gyp:webkit_storage_browser', 60 '../webkit/storage_browser.gyp:webkit_storage_browser',
60 '../webkit/storage_common.gyp:webkit_storage_common', 61 '../webkit/storage_common.gyp:webkit_storage_common',
61 '../webkit/webkit_resources.gyp:webkit_resources', 62 '../webkit/webkit_resources.gyp:webkit_resources',
62 ], 63 ],
63 'include_dirs': [ 64 'include_dirs': [
64 '..', 65 '..',
65 '<(INTERMEDIATE_DIR)', 66 '<(INTERMEDIATE_DIR)',
66 ], 67 ],
67 'export_dependent_settings': [ 68 'export_dependent_settings': [
69 'common/extensions/api/api.gyp:chrome_api',
Ryan Sleevi 2014/03/27 23:21:40 In order for export_dependent_settings to work, it
Yoyo Zhou 2014/03/28 00:12:05 chrome_api is already in the dependencies. It's us
Ryan Sleevi 2014/03/28 00:19:59 Doh! I missed that above.
68 '../content/content.gyp:content_browser', 70 '../content/content.gyp:content_browser',
69 ], 71 ],
70 'sources': [ 72 'sources': [
71 # All .cc, .h, .m, and .mm files under browser/extensions except for 73 # All .cc, .h, .m, and .mm files under browser/extensions except for
72 # tests and mocks. 74 # tests and mocks.
73 'browser/apps/app_launch_for_metro_restart_win.cc', 75 'browser/apps/app_launch_for_metro_restart_win.cc',
74 'browser/apps/app_launch_for_metro_restart_win.h', 76 'browser/apps/app_launch_for_metro_restart_win.h',
75 'browser/apps/app_url_redirector.cc', 77 'browser/apps/app_url_redirector.cc',
76 'browser/apps/app_url_redirector.h', 78 'browser/apps/app_url_redirector.h',
77 'browser/apps/chrome_apps_client.cc', 79 'browser/apps/chrome_apps_client.cc',
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 'type': 'static_library', 1185 'type': 'static_library',
1184 'sources': [ 'browser/extensions/api/cast_channel/cast_channel.proto' ], 1186 'sources': [ 'browser/extensions/api/cast_channel/cast_channel.proto' ],
1185 'variables': { 1187 'variables': {
1186 'proto_in_dir': 'browser/extensions/api/cast_channel', 1188 'proto_in_dir': 'browser/extensions/api/cast_channel',
1187 'proto_out_dir': 'chrome/browser/extensions/api/cast_channel', 1189 'proto_out_dir': 'chrome/browser/extensions/api/cast_channel',
1188 }, 1190 },
1189 'includes': [ '../build/protoc.gypi' ] 1191 'includes': [ '../build/protoc.gypi' ]
1190 }, 1192 },
1191 ], # 'conditions' 1193 ], # 'conditions'
1192 } 1194 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698