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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
11 'variables': { 11 'variables': {
12 'conditions': [ 12 'conditions': [
13 ['sysroot!=""', { 13 ['sysroot!=""', {
14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)" "<(system_libdir)"', 14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)" "<(system_libdir)"',
15 }, { 15 }, {
16 'pkg-config': 'pkg-config' 16 'pkg-config': 'pkg-config'
17 }], 17 }],
18 ], 18 ],
19 # Override to dynamically link the cras (ChromeOS audio) library. 19 # Override to dynamically link the cras (ChromeOS audio) library.
20 'use_cras%': 0, 20 'use_cras%': 0,
21 'enable_wexit_time_destructors': 1, 21 'enable_wexit_time_destructors': 1,
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 # TODO(tbarzic): Cleanup this list. 24 # TODO(tbarzic): Cleanup this list.
25 'attestation_proto', 25 'attestation_proto',
26 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
27 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ', 26 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ',
28 'browser_extensions', 27 'browser_extensions',
29 'cert_logger_proto', 28 'cert_logger_proto',
30 'chrome_resources.gyp:chrome_extra_resources', 29 'chrome_resources.gyp:chrome_extra_resources',
31 'chrome_resources.gyp:chrome_resources', 30 'chrome_resources.gyp:chrome_resources',
32 'chrome_resources.gyp:platform_locale_settings', 31 'chrome_resources.gyp:platform_locale_settings',
33 'chrome_resources.gyp:theme_resources', 32 'chrome_resources.gyp:theme_resources',
34 'common', 33 'common',
35 'common/extensions/api/api.gyp:chrome_api', 34 'common/extensions/api/api.gyp:chrome_api',
36 'common_net', 35 'common_net',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ], 109 ],
111 'defines': [ 110 'defines': [
112 '<@(nacl_defines)', 111 '<@(nacl_defines)',
113 ], 112 ],
114 'direct_dependent_settings': { 113 'direct_dependent_settings': {
115 'defines': [ 114 'defines': [
116 '<@(nacl_defines)', 115 '<@(nacl_defines)',
117 ], 116 ],
118 }, 117 },
119 'export_dependent_settings': [ 118 'export_dependent_settings': [
120 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
121 'common/extensions/api/api.gyp:chrome_api', 119 'common/extensions/api/api.gyp:chrome_api',
122 '../sync/sync.gyp:sync', 120 '../sync/sync.gyp:sync',
123 ], 121 ],
124 'include_dirs': [ 122 'include_dirs': [
125 # breakpad_linux.cc uses generated file_version_info_linux.h. 123 # breakpad_linux.cc uses generated file_version_info_linux.h.
126 '<(SHARED_INTERMEDIATE_DIR)', 124 '<(SHARED_INTERMEDIATE_DIR)',
127 '../breakpad/src', 125 '../breakpad/src',
128 ], 126 ],
129 'sources': [ 127 'sources': [
130 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 128 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 'browser/chromeos/attestation/attestation_signed_data.proto', 1194 'browser/chromeos/attestation/attestation_signed_data.proto',
1197 ], 1195 ],
1198 'variables': { 1196 'variables': {
1199 'proto_in_dir': 'browser/chromeos/attestation', 1197 'proto_in_dir': 'browser/chromeos/attestation',
1200 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1198 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1201 }, 1199 },
1202 'includes': [ '../build/protoc.gypi' ] 1200 'includes': [ '../build/protoc.gypi' ]
1203 }, 1201 },
1204 ], 1202 ],
1205 } 1203 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698