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

Side by Side Diff: content/content.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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/browser/webui/web_ui_mojo_browsertest.cc ('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 'content_common_mojo_bindings.gypi', 28 'content_common_mojo_bindings.gypi',
28 'content_resources.gypi', 29 'content_resources.gypi',
29 '../build/win_precompile.gypi',
30 ], 30 ],
31 }], 31 }],
32 ['OS == "win"', { 32 ['OS == "win"', {
33 'targets': [ 33 'targets': [
34 { 34 {
35 'target_name': 'content_startup_helper_win', 35 'target_name': 'content_startup_helper_win',
36 'type': 'static_library', 36 'type': 'static_library',
37 'include_dirs': [ 37 'include_dirs': [
38 '..', 38 '..',
39 ], 39 ],
(...skipping 28 matching lines...) Expand all
68 'content_browser', 68 'content_browser',
69 'content_common', 69 'content_common',
70 ], 70 ],
71 'export_dependent_settings': [ 71 'export_dependent_settings': [
72 'content_common', 72 'content_common',
73 ], 73 ],
74 'conditions': [ 74 'conditions': [
75 ['OS != "ios"', { 75 ['OS != "ios"', {
76 'dependencies': [ 76 'dependencies': [
77 'content_child', 77 'content_child',
78 'content_common_mojo_bindings',
78 'content_gpu', 79 'content_gpu',
79 'content_plugin', 80 'content_plugin',
80 'content_ppapi_plugin', 81 'content_ppapi_plugin',
81 'content_renderer', 82 'content_renderer',
82 'content_utility', 83 'content_utility',
83 ], 84 ],
84 }], 85 }],
85 ], 86 ],
86 }, 87 },
87 { 88 {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 ] 168 ]
168 }], 169 }],
169 ['OS=="android"', { 170 ['OS=="android"', {
170 'dependencies': [ 171 'dependencies': [
171 'content_gpu', 172 'content_gpu',
172 'content_utility', 173 'content_utility',
173 ], 174 ],
174 }], 175 }],
175 ['OS != "ios"', { 176 ['OS != "ios"', {
176 'dependencies': [ 177 'dependencies': [
178 'content_common_mojo_bindings',
177 'content_resources', 179 'content_resources',
178 ], 180 ],
179 }], 181 }],
180 ], 182 ],
181 }, 183 },
182 { 184 {
183 # GN version: //content/common and //content/public/common 185 # GN version: //content/common and //content/public/common
184 'target_name': 'content_common', 186 'target_name': 'content_common',
185 'type': 'static_library', 187 'type': 'static_library',
186 'variables': { 'enable_wexit_time_destructors': 1, }, 188 'variables': { 'enable_wexit_time_destructors': 1, },
187 'includes': [ 189 'includes': [
188 'content_common.gypi', 190 'content_common.gypi',
189 ], 191 ],
190 'conditions': [ 192 'conditions': [
191 ['OS != "ios"', { 193 ['OS != "ios"', {
192 'dependencies': [ 194 'dependencies': [
195 'content_common_mojo_bindings',
193 'content_resources', 196 'content_resources',
194 ], 197 ],
195 }], 198 }],
196 ], 199 ],
197 # Disable c4267 warnings until we fix size_t to int truncations. 200 # Disable c4267 warnings until we fix size_t to int truncations.
198 'msvs_disabled_warnings': [ 4267, ], 201 'msvs_disabled_warnings': [ 4267, ],
199 }, 202 },
200 ], 203 ],
201 'conditions': [ 204 'conditions': [
202 ['OS != "ios"', { 205 ['OS != "ios"', {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'variables': { 'enable_wexit_time_destructors': 1, }, 302 'variables': { 'enable_wexit_time_destructors': 1, },
300 'dependencies': [ 303 'dependencies': [
301 'content_resources', 304 'content_resources',
302 ], 305 ],
303 'conditions': [ 306 'conditions': [
304 ['chromium_enable_vtune_jit_for_v8==1', { 307 ['chromium_enable_vtune_jit_for_v8==1', {
305 'dependencies': [ 308 'dependencies': [
306 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 309 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
307 ], 310 ],
308 }], 311 }],
312 ['OS != "ios"', {
313 'dependencies': [
314 'content_common_mojo_bindings',
315 ]
316 }]
309 ], 317 ],
310 'includes': [ 318 'includes': [
311 'content_app.gypi', 319 'content_app.gypi',
312 'content_browser.gypi', 320 'content_browser.gypi',
313 'content_child.gypi', 321 'content_child.gypi',
314 'content_common.gypi', 322 'content_common.gypi',
315 'content_gpu.gypi', 323 'content_gpu.gypi',
316 'content_plugin.gypi', 324 'content_plugin.gypi',
317 'content_ppapi_plugin.gypi', 325 'content_ppapi_plugin.gypi',
318 'content_renderer.gypi', 326 'content_renderer.gypi',
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 'includes': [ '../build/java_aidl.gypi' ], 428 'includes': [ '../build/java_aidl.gypi' ],
421 }, 429 },
422 { 430 {
423 'target_name': 'content_java', 431 'target_name': 'content_java',
424 'type': 'none', 432 'type': 'none',
425 'dependencies': [ 433 'dependencies': [
426 '../base/base.gyp:base', 434 '../base/base.gyp:base',
427 '../device/battery/battery.gyp:device_battery_java', 435 '../device/battery/battery.gyp:device_battery_java',
428 '../media/media.gyp:media_java', 436 '../media/media.gyp:media_java',
429 '../mojo/mojo_base.gyp:mojo_system_java', 437 '../mojo/mojo_base.gyp:mojo_system_java',
438 '../mojo/public/mojo_public.gyp:mojo_application_bindings',
430 '../mojo/public/mojo_public.gyp:mojo_bindings_java', 439 '../mojo/public/mojo_public.gyp:mojo_bindings_java',
431 '../net/net.gyp:net', 440 '../net/net.gyp:net',
432 '../ui/android/ui_android.gyp:ui_java', 441 '../ui/android/ui_android.gyp:ui_java',
433 'common_aidl', 442 'common_aidl',
434 'content_common', 443 'content_common',
435 'content_strings_grd', 444 'content_strings_grd',
436 'content_gamepad_mapping', 445 'content_gamepad_mapping',
437 'gesture_event_type_java', 446 'gesture_event_type_java',
438 'popup_item_type_java', 447 'popup_item_type_java',
439 'result_codes_java', 448 'result_codes_java',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 ], 599 ],
591 }, 600 },
592 ], 601 ],
593 }], 602 }],
594 ], 603 ],
595 }, 604 },
596 ], 605 ],
597 }], # OS == "android" 606 }], # OS == "android"
598 ], 607 ],
599 } 608 }
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698