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

Side by Side Diff: chrome/chrome_browser_extensions.gypi

Issue 189713002: Declare dependency on blink_headers in targets that use blink headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge of export_dependent_settings block in content_browser.gypi 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 '../ui/resources/ui_resources.gyp:ui_resources', 57 '../ui/resources/ui_resources.gyp:ui_resources',
58 '../url/url.gyp:url_lib', 58 '../url/url.gyp:url_lib',
59 '../webkit/storage_browser.gyp:webkit_storage_browser', 59 '../webkit/storage_browser.gyp:webkit_storage_browser',
60 '../webkit/storage_common.gyp:webkit_storage_common', 60 '../webkit/storage_common.gyp:webkit_storage_common',
61 '../webkit/webkit_resources.gyp:webkit_resources', 61 '../webkit/webkit_resources.gyp:webkit_resources',
62 ], 62 ],
63 'include_dirs': [ 63 'include_dirs': [
64 '..', 64 '..',
65 '<(INTERMEDIATE_DIR)', 65 '<(INTERMEDIATE_DIR)',
66 ], 66 ],
67 'export_dependent_settings': [
68 '../content/content.gyp:content_browser',
69 ],
67 'sources': [ 70 'sources': [
68 # All .cc, .h, .m, and .mm files under browser/extensions except for 71 # All .cc, .h, .m, and .mm files under browser/extensions except for
69 # tests and mocks. 72 # tests and mocks.
70 'browser/apps/app_launch_for_metro_restart_win.cc', 73 'browser/apps/app_launch_for_metro_restart_win.cc',
71 'browser/apps/app_launch_for_metro_restart_win.h', 74 'browser/apps/app_launch_for_metro_restart_win.h',
72 'browser/apps/app_url_redirector.cc', 75 'browser/apps/app_url_redirector.cc',
73 'browser/apps/app_url_redirector.h', 76 'browser/apps/app_url_redirector.h',
74 'browser/apps/chrome_apps_client.cc', 77 'browser/apps/chrome_apps_client.cc',
75 'browser/apps/chrome_apps_client.h', 78 'browser/apps/chrome_apps_client.h',
76 'browser/apps/ephemeral_app_launcher.cc', 79 'browser/apps/ephemeral_app_launcher.cc',
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 'variables': { 1201 'variables': {
1199 'proto_in_dir': 'browser/chromeos/contacts', 1202 'proto_in_dir': 'browser/chromeos/contacts',
1200 'proto_out_dir': 'chrome/browser/chromeos/contacts', 1203 'proto_out_dir': 'chrome/browser/chromeos/contacts',
1201 }, 1204 },
1202 'includes': [ '../build/protoc.gypi' ] 1205 'includes': [ '../build/protoc.gypi' ]
1203 }, 1206 },
1204 ], 1207 ],
1205 },], # 'chromeos=1' 1208 },], # 'chromeos=1'
1206 ], # 'conditions' 1209 ], # 'conditions'
1207 } 1210 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | components/nacl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698