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

Side by Side Diff: content/content.gyp

Issue 750633003: Implement HasPermission() method in PermissionService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert to a version with cleaner gypis 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 ],
24 'conditions': [ 27 'conditions': [
25 ['OS != "ios"', { 28 ['OS != "ios"', {
26 'includes': [ 29 'includes': [
27 '../build/win_precompile.gypi', 30 '../build/win_precompile.gypi',
28 'content_common_mojo_bindings.gypi',
29 'content_resources.gypi', 31 'content_resources.gypi',
30 ], 32 ],
31 }], 33 }],
32 ['OS == "win"', { 34 ['OS == "win"', {
33 'targets': [ 35 'targets': [
34 { 36 {
35 'target_name': 'content_startup_helper_win', 37 'target_name': 'content_startup_helper_win',
36 'type': 'static_library', 38 'type': 'static_library',
37 'include_dirs': [ 39 'include_dirs': [
38 '..', 40 '..',
(...skipping 21 matching lines...) Expand all
60 'COMPILE_CONTENT_STATICALLY', 62 'COMPILE_CONTENT_STATICALLY',
61 ], 63 ],
62 'targets': [ 64 'targets': [
63 { 65 {
64 # GN version: //content 66 # GN version: //content
65 'target_name': 'content', 67 'target_name': 'content',
66 'type': 'none', 68 'type': 'none',
67 'dependencies': [ 69 'dependencies': [
68 'content_browser', 70 'content_browser',
69 'content_common', 71 'content_common',
72 'content_common_mojo_bindings',
70 ], 73 ],
71 'export_dependent_settings': [ 74 'export_dependent_settings': [
72 'content_common', 75 'content_common',
73 ], 76 ],
74 'conditions': [ 77 'conditions': [
75 ['OS != "ios"', { 78 ['OS != "ios"', {
76 'dependencies': [ 79 'dependencies': [
77 'content_child', 80 'content_child',
78 'content_common_mojo_bindings',
79 'content_gpu', 81 'content_gpu',
80 'content_plugin', 82 'content_plugin',
81 'content_ppapi_plugin', 83 'content_ppapi_plugin',
82 'content_renderer', 84 'content_renderer',
83 'content_utility', 85 'content_utility',
84 ], 86 ],
85 }], 87 }],
86 ], 88 ],
87 }, 89 },
88 { 90 {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 'type': 'static_library', 152 'type': 'static_library',
151 'variables': { 'enable_wexit_time_destructors': 1, }, 153 'variables': { 'enable_wexit_time_destructors': 1, },
152 'includes': [ 154 'includes': [
153 'content_browser.gypi', 155 'content_browser.gypi',
154 # Disable LTO due to ELF section name out of range 156 # Disable LTO due to ELF section name out of range
155 # crbug.com/422251 157 # crbug.com/422251
156 '../build/android/disable_lto.gypi', 158 '../build/android/disable_lto.gypi',
157 ], 159 ],
158 'dependencies': [ 160 'dependencies': [
159 'content_common', 161 'content_common',
162 'content_common_mojo_bindings',
160 ], 163 ],
161 'export_dependent_settings': [ 164 'export_dependent_settings': [
162 'content_common', 165 'content_common',
blundell 2014/12/03 15:43:45 You should export_dependent_settings on content_co
timvolodine 2014/12/03 19:23:34 Done.
163 ], 166 ],
164 'conditions': [ 167 'conditions': [
165 ['java_bridge==1', { 168 ['java_bridge==1', {
166 'dependencies': [ 169 'dependencies': [
167 'content_child', 170 'content_child',
168 ] 171 ]
169 }], 172 }],
170 ['OS=="android"', { 173 ['OS=="android"', {
171 'dependencies': [ 174 'dependencies': [
172 'content_gpu', 175 'content_gpu',
173 'content_utility', 176 'content_utility',
174 ], 177 ],
175 }], 178 }],
176 ['OS != "ios"', { 179 ['OS != "ios"', {
177 'dependencies': [ 180 'dependencies': [
178 'content_common_mojo_bindings',
179 'content_resources', 181 'content_resources',
180 ], 182 ],
181 }], 183 }],
182 ], 184 ],
183 }, 185 },
184 { 186 {
185 # GN version: //content/common and //content/public/common 187 # GN version: //content/common and //content/public/common
186 'target_name': 'content_common', 188 'target_name': 'content_common',
187 'type': 'static_library', 189 'type': 'static_library',
188 'variables': { 'enable_wexit_time_destructors': 1, }, 190 'variables': { 'enable_wexit_time_destructors': 1, },
189 'includes': [ 191 'includes': [
190 'content_common.gypi', 192 'content_common.gypi',
191 ], 193 ],
194 'dependencies': [
195 'content_common_mojo_bindings',
196 ],
192 'conditions': [ 197 'conditions': [
193 ['OS != "ios"', { 198 ['OS != "ios"', {
194 'dependencies': [ 199 'dependencies': [
195 'content_common_mojo_bindings',
196 'content_resources', 200 'content_resources',
197 ], 201 ],
198 }], 202 }],
199 ], 203 ],
200 # Disable c4267 warnings until we fix size_t to int truncations. 204 # Disable c4267 warnings until we fix size_t to int truncations.
201 'msvs_disabled_warnings': [ 4267, ], 205 'msvs_disabled_warnings': [ 4267, ],
202 }, 206 },
203 ], 207 ],
204 'conditions': [ 208 'conditions': [
205 ['OS != "ios"', { 209 ['OS != "ios"', {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 ], 301 ],
298 }, 302 },
299 { # component != static_library 303 { # component != static_library
300 'targets': [ 304 'targets': [
301 { 305 {
302 # GN version: //content 306 # GN version: //content
303 'target_name': 'content', 307 'target_name': 'content',
304 'type': 'shared_library', 308 'type': 'shared_library',
305 'variables': { 'enable_wexit_time_destructors': 1, }, 309 'variables': { 'enable_wexit_time_destructors': 1, },
306 'dependencies': [ 310 'dependencies': [
311 'content_common_mojo_bindings',
blundell 2014/12/03 15:43:46 and here.
timvolodine 2014/12/03 19:23:34 Done.
307 'content_resources', 312 'content_resources',
308 ], 313 ],
309 'conditions': [ 314 'conditions': [
310 ['chromium_enable_vtune_jit_for_v8==1', { 315 ['chromium_enable_vtune_jit_for_v8==1', {
311 'dependencies': [ 316 'dependencies': [
312 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 317 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
313 ], 318 ],
314 }], 319 }],
315 ['OS != "ios"', {
316 'dependencies': [
317 'content_common_mojo_bindings',
318 ]
319 }]
320 ], 320 ],
321 'includes': [ 321 'includes': [
322 'content_app.gypi', 322 'content_app.gypi',
323 'content_browser.gypi', 323 'content_browser.gypi',
324 'content_child.gypi', 324 'content_child.gypi',
325 'content_common.gypi', 325 'content_common.gypi',
326 'content_gpu.gypi', 326 'content_gpu.gypi',
327 'content_plugin.gypi', 327 'content_plugin.gypi',
328 'content_ppapi_plugin.gypi', 328 'content_ppapi_plugin.gypi',
329 'content_renderer.gypi', 329 'content_renderer.gypi',
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 ], 596 ],
597 }, 597 },
598 ], 598 ],
599 }], 599 }],
600 ], 600 ],
601 }, 601 },
602 ], 602 ],
603 }], # OS == "android" 603 }], # OS == "android"
604 ], 604 ],
605 } 605 }
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