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

Side by Side Diff: content/content.gyp

Issue 786063002: Revert of Implement HasPermission() method in PermissionService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « content/common/permission_service.mojom ('k') | content/content_app.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 # 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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
11 'target_defaults': { 11 'target_defaults': {
12 'defines': ['CONTENT_IMPLEMENTATION'], 12 'defines': ['CONTENT_IMPLEMENTATION'],
13 'conditions': [ 13 'conditions': [
14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
15 ['OS=="win" and target_arch=="x64"', { 15 ['OS=="win" and target_arch=="x64"', {
16 'msvs_settings': { 16 'msvs_settings': {
17 'VCCLCompilerTool': { 17 'VCCLCompilerTool': {
18 'AdditionalOptions': ['/bigobj'], 18 'AdditionalOptions': ['/bigobj'],
19 }, 19 },
20 }, 20 },
21 }], 21 }],
22 ], 22 ],
23 }, 23 },
24 'includes': [
25 'content_common_mojo_bindings.gypi',
26 ],
27 'conditions': [ 24 'conditions': [
28 ['OS != "ios"', { 25 ['OS != "ios"', {
29 'includes': [ 26 'includes': [
30 '../build/win_precompile.gypi', 27 '../build/win_precompile.gypi',
28 'content_common_mojo_bindings.gypi',
31 'content_resources.gypi', 29 'content_resources.gypi',
32 ], 30 ],
33 }], 31 }],
34 ['OS == "win"', { 32 ['OS == "win"', {
35 'targets': [ 33 'targets': [
36 { 34 {
37 'target_name': 'content_startup_helper_win', 35 'target_name': 'content_startup_helper_win',
38 'type': 'static_library', 36 'type': 'static_library',
39 'include_dirs': [ 37 'include_dirs': [
40 '..', 38 '..',
(...skipping 21 matching lines...) Expand all
62 'COMPILE_CONTENT_STATICALLY', 60 'COMPILE_CONTENT_STATICALLY',
63 ], 61 ],
64 'targets': [ 62 'targets': [
65 { 63 {
66 # GN version: //content 64 # GN version: //content
67 'target_name': 'content', 65 'target_name': 'content',
68 'type': 'none', 66 'type': 'none',
69 'dependencies': [ 67 'dependencies': [
70 'content_browser', 68 'content_browser',
71 'content_common', 69 'content_common',
72 'content_common_mojo_bindings',
73 ], 70 ],
74 'export_dependent_settings': [ 71 'export_dependent_settings': [
75 'content_common', 72 'content_common',
76 'content_common_mojo_bindings',
77 ], 73 ],
78 'conditions': [ 74 'conditions': [
79 ['OS != "ios"', { 75 ['OS != "ios"', {
80 'dependencies': [ 76 'dependencies': [
81 'content_child', 77 'content_child',
78 'content_common_mojo_bindings',
82 'content_gpu', 79 'content_gpu',
83 'content_plugin', 80 'content_plugin',
84 'content_ppapi_plugin', 81 'content_ppapi_plugin',
85 'content_renderer', 82 'content_renderer',
86 'content_utility', 83 'content_utility',
87 ], 84 ],
88 }], 85 }],
89 ], 86 ],
90 }, 87 },
91 { 88 {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 { 132 {
136 # GN version: //content/app:both 133 # GN version: //content/app:both
137 'target_name': 'content_app_both', 134 'target_name': 'content_app_both',
138 'type': 'static_library', 135 'type': 'static_library',
139 'variables': { 'enable_wexit_time_destructors': 1, }, 136 'variables': { 'enable_wexit_time_destructors': 1, },
140 'includes': [ 137 'includes': [
141 'content_app.gypi', 138 'content_app.gypi',
142 ], 139 ],
143 'dependencies': [ 140 'dependencies': [
144 'content_common', 141 'content_common',
145 'content_common_mojo_bindings',
146 ], 142 ],
147 'export_dependent_settings': [ 143 'export_dependent_settings': [
148 'content_common', 144 'content_common',
149 'content_common_mojo_bindings',
150 ], 145 ],
151 }, 146 },
152 { 147 {
153 # GN version: //content/browser and //content/public/browser 148 # GN version: //content/browser and //content/public/browser
154 'target_name': 'content_browser', 149 'target_name': 'content_browser',
155 'type': 'static_library', 150 'type': 'static_library',
156 'variables': { 'enable_wexit_time_destructors': 1, }, 151 'variables': { 'enable_wexit_time_destructors': 1, },
157 'includes': [ 152 'includes': [
158 'content_browser.gypi', 153 'content_browser.gypi',
159 # Disable LTO due to ELF section name out of range 154 # Disable LTO due to ELF section name out of range
160 # crbug.com/422251 155 # crbug.com/422251
161 '../build/android/disable_lto.gypi', 156 '../build/android/disable_lto.gypi',
162 ], 157 ],
163 'dependencies': [ 158 'dependencies': [
164 'content_common', 159 'content_common',
165 'content_common_mojo_bindings',
166 ], 160 ],
167 'export_dependent_settings': [ 161 'export_dependent_settings': [
168 'content_common', 162 'content_common',
169 'content_common_mojo_bindings',
170 ], 163 ],
171 'conditions': [ 164 'conditions': [
172 ['java_bridge==1', { 165 ['java_bridge==1', {
173 'dependencies': [ 166 'dependencies': [
174 'content_child', 167 'content_child',
175 ] 168 ]
176 }], 169 }],
177 ['OS=="android"', { 170 ['OS=="android"', {
178 'dependencies': [ 171 'dependencies': [
179 'content_gpu', 172 'content_gpu',
180 'content_utility', 173 'content_utility',
181 ], 174 ],
182 }], 175 }],
183 ['OS != "ios"', { 176 ['OS != "ios"', {
184 'dependencies': [ 177 'dependencies': [
178 'content_common_mojo_bindings',
185 'content_resources', 179 'content_resources',
186 ], 180 ],
187 }], 181 }],
188 ], 182 ],
189 }, 183 },
190 { 184 {
191 # GN version: //content/common and //content/public/common 185 # GN version: //content/common and //content/public/common
192 'target_name': 'content_common', 186 'target_name': 'content_common',
193 'type': 'static_library', 187 'type': 'static_library',
194 'variables': { 'enable_wexit_time_destructors': 1, }, 188 'variables': { 'enable_wexit_time_destructors': 1, },
195 'includes': [ 189 'includes': [
196 'content_common.gypi', 190 'content_common.gypi',
197 ], 191 ],
198 'dependencies': [
199 'content_common_mojo_bindings',
200 ],
201 'conditions': [ 192 'conditions': [
202 ['OS != "ios"', { 193 ['OS != "ios"', {
203 'dependencies': [ 194 'dependencies': [
195 'content_common_mojo_bindings',
204 'content_resources', 196 'content_resources',
205 ], 197 ],
206 }], 198 }],
207 ], 199 ],
208 # Disable c4267 warnings until we fix size_t to int truncations. 200 # Disable c4267 warnings until we fix size_t to int truncations.
209 'msvs_disabled_warnings': [ 4267, ], 201 'msvs_disabled_warnings': [ 4267, ],
210 }, 202 },
211 ], 203 ],
212 'conditions': [ 204 'conditions': [
213 ['OS != "ios"', { 205 ['OS != "ios"', {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 ], 297 ],
306 }, 298 },
307 { # component != static_library 299 { # component != static_library
308 'targets': [ 300 'targets': [
309 { 301 {
310 # GN version: //content 302 # GN version: //content
311 'target_name': 'content', 303 'target_name': 'content',
312 'type': 'shared_library', 304 'type': 'shared_library',
313 'variables': { 'enable_wexit_time_destructors': 1, }, 305 'variables': { 'enable_wexit_time_destructors': 1, },
314 'dependencies': [ 306 'dependencies': [
315 'content_common_mojo_bindings',
316 'content_resources', 307 'content_resources',
317 ], 308 ],
318 'export_dependent_settings': [
319 'content_common_mojo_bindings',
320 ],
321 'conditions': [ 309 'conditions': [
322 ['chromium_enable_vtune_jit_for_v8==1', { 310 ['chromium_enable_vtune_jit_for_v8==1', {
323 'dependencies': [ 311 'dependencies': [
324 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 312 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
325 ], 313 ],
326 }], 314 }],
315 ['OS != "ios"', {
316 'dependencies': [
317 'content_common_mojo_bindings',
318 ]
319 }]
327 ], 320 ],
328 'includes': [ 321 'includes': [
329 'content_app.gypi', 322 'content_app.gypi',
330 'content_browser.gypi', 323 'content_browser.gypi',
331 'content_child.gypi', 324 'content_child.gypi',
332 'content_common.gypi', 325 'content_common.gypi',
333 'content_gpu.gypi', 326 'content_gpu.gypi',
334 'content_plugin.gypi', 327 'content_plugin.gypi',
335 'content_ppapi_plugin.gypi', 328 'content_ppapi_plugin.gypi',
336 'content_renderer.gypi', 329 'content_renderer.gypi',
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 ], 597 ],
605 }, 598 },
606 ], 599 ],
607 }], 600 }],
608 ], 601 ],
609 }, 602 },
610 ], 603 ],
611 }], # OS == "android" 604 }], # OS == "android"
612 ], 605 ],
613 } 606 }
OLDNEW
« no previous file with comments | « content/common/permission_service.mojom ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698