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

Side by Side Diff: content/content.gyp

Issue 792173002: 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 'conditions': [ 24 'conditions': [
25 ['OS != "ios"', { 25 ['OS != "ios"', {
26 'includes': [ 26 'includes': [
27 '../build/win_precompile.gypi', 27 '../build/win_precompile.gypi',
28 'content_common_mojo_bindings.gypi',
28 'content_resources.gypi', 29 'content_resources.gypi',
29 ], 30 ],
30 }], 31 }],
31 ['OS == "win"', { 32 ['OS == "win"', {
32 'targets': [ 33 'targets': [
33 { 34 {
34 'target_name': 'content_startup_helper_win', 35 'target_name': 'content_startup_helper_win',
35 'type': 'static_library', 36 'type': 'static_library',
36 'include_dirs': [ 37 'include_dirs': [
37 '..', 38 '..',
(...skipping 29 matching lines...) Expand all
67 'content_browser', 68 'content_browser',
68 'content_common', 69 'content_common',
69 ], 70 ],
70 'export_dependent_settings': [ 71 'export_dependent_settings': [
71 'content_common', 72 'content_common',
72 ], 73 ],
73 'conditions': [ 74 'conditions': [
74 ['OS != "ios"', { 75 ['OS != "ios"', {
75 'dependencies': [ 76 'dependencies': [
76 'content_child', 77 'content_child',
78 'content_common_mojo_bindings',
77 'content_gpu', 79 'content_gpu',
78 'content_plugin', 80 'content_plugin',
79 'content_ppapi_plugin', 81 'content_ppapi_plugin',
80 'content_renderer', 82 'content_renderer',
81 'content_utility', 83 'content_utility',
82 ], 84 ],
83 }], 85 }],
84 ], 86 ],
85 }, 87 },
86 { 88 {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 ] 168 ]
167 }], 169 }],
168 ['OS=="android"', { 170 ['OS=="android"', {
169 'dependencies': [ 171 'dependencies': [
170 'content_gpu', 172 'content_gpu',
171 'content_utility', 173 'content_utility',
172 ], 174 ],
173 }], 175 }],
174 ['OS != "ios"', { 176 ['OS != "ios"', {
175 'dependencies': [ 177 'dependencies': [
178 'content_common_mojo_bindings',
176 'content_resources', 179 'content_resources',
177 ], 180 ],
178 }], 181 }],
179 ], 182 ],
180 }, 183 },
181 { 184 {
182 # GN version: //content/common and //content/public/common 185 # GN version: //content/common and //content/public/common
183 'target_name': 'content_common', 186 'target_name': 'content_common',
184 'type': 'static_library', 187 'type': 'static_library',
185 'variables': { 'enable_wexit_time_destructors': 1, }, 188 'variables': { 'enable_wexit_time_destructors': 1, },
186 'includes': [ 189 'includes': [
187 'content_common.gypi', 190 'content_common.gypi',
188 ], 191 ],
189 'conditions': [ 192 'conditions': [
190 ['OS != "ios"', { 193 ['OS != "ios"', {
191 'dependencies': [ 194 'dependencies': [
195 'content_common_mojo_bindings',
192 'content_resources', 196 'content_resources',
193 ], 197 ],
194 }], 198 }],
195 ], 199 ],
196 # Disable c4267 warnings until we fix size_t to int truncations. 200 # Disable c4267 warnings until we fix size_t to int truncations.
197 'msvs_disabled_warnings': [ 4267, ], 201 'msvs_disabled_warnings': [ 4267, ],
198 }, 202 },
199 ], 203 ],
200 'conditions': [ 204 'conditions': [
201 ['OS != "ios"', { 205 ['OS != "ios"', {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 'variables': { 'enable_wexit_time_destructors': 1, }, 305 'variables': { 'enable_wexit_time_destructors': 1, },
302 'dependencies': [ 306 'dependencies': [
303 'content_resources', 307 'content_resources',
304 ], 308 ],
305 'conditions': [ 309 'conditions': [
306 ['chromium_enable_vtune_jit_for_v8==1', { 310 ['chromium_enable_vtune_jit_for_v8==1', {
307 'dependencies': [ 311 'dependencies': [
308 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 312 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
309 ], 313 ],
310 }], 314 }],
315 ['OS != "ios"', {
316 'dependencies': [
317 'content_common_mojo_bindings',
318 ]
319 }]
311 ], 320 ],
312 'includes': [ 321 'includes': [
313 'content_app.gypi', 322 'content_app.gypi',
314 'content_browser.gypi', 323 'content_browser.gypi',
315 'content_child.gypi', 324 'content_child.gypi',
316 'content_common.gypi', 325 'content_common.gypi',
317 'content_gpu.gypi', 326 'content_gpu.gypi',
318 'content_plugin.gypi', 327 'content_plugin.gypi',
319 'content_ppapi_plugin.gypi', 328 'content_ppapi_plugin.gypi',
320 'content_renderer.gypi', 329 'content_renderer.gypi',
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ], 597 ],
589 }, 598 },
590 ], 599 ],
591 }], 600 }],
592 ], 601 ],
593 }, 602 },
594 ], 603 ],
595 }], # OS == "android" 604 }], # OS == "android"
596 ], 605 ],
597 } 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