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

Side by Side Diff: content/content.gyp

Issue 189713002: Declare dependency on blink_headers in targets that use blink headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge of export_dependent_settings block in content_browser.gypi Created 6 years, 9 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 | Annotate | Revision Log
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': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
10 }, 10 },
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 { 136 {
137 'target_name': 'content_app_both', 137 'target_name': 'content_app_both',
138 'type': 'static_library', 138 'type': 'static_library',
139 'variables': { 'enable_wexit_time_destructors': 1, }, 139 'variables': { 'enable_wexit_time_destructors': 1, },
140 'includes': [ 140 'includes': [
141 'content_app.gypi', 141 'content_app.gypi',
142 ], 142 ],
143 'dependencies': [ 143 'dependencies': [
144 'content_common', 144 'content_common',
145 ], 145 ],
146 'export_dependent_settings': [
147 'content_common',
148 ],
146 }, 149 },
147 { 150 {
148 'target_name': 'content_browser', 151 'target_name': 'content_browser',
149 'type': 'static_library', 152 'type': 'static_library',
150 'variables': { 'enable_wexit_time_destructors': 1, }, 153 'variables': { 'enable_wexit_time_destructors': 1, },
151 'includes': [ 154 'includes': [
152 'content_browser.gypi', 155 'content_browser.gypi',
153 ], 156 ],
154 'dependencies': [ 157 'dependencies': [
155 'content_common', 158 'content_common',
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 }, 333 },
331 { 334 {
332 'target_name': 'content_app_child', 335 'target_name': 'content_app_child',
333 'type': 'none', 336 'type': 'none',
334 'dependencies': ['content', 'content_child'], 337 'dependencies': ['content', 'content_child'],
335 }, 338 },
336 { 339 {
337 'target_name': 'content_app_both', 340 'target_name': 'content_app_both',
338 'type': 'none', 341 'type': 'none',
339 'dependencies': ['content'], 342 'dependencies': ['content'],
343 'export_dependent_settings': ['content'],
340 }, 344 },
341 { 345 {
342 'target_name': 'content_browser', 346 'target_name': 'content_browser',
343 'type': 'none', 347 'type': 'none',
344 'dependencies': ['content'], 348 'dependencies': ['content'],
349 'export_dependent_settings': ['content'],
345 }, 350 },
346 { 351 {
347 'target_name': 'content_common', 352 'target_name': 'content_common',
348 'type': 'none', 353 'type': 'none',
349 'dependencies': ['content', 'content_resources.gyp:content_resources'] , 354 'dependencies': ['content', 'content_resources.gyp:content_resources'] ,
350 # Disable c4267 warnings until we fix size_t to int truncations. 355 # Disable c4267 warnings until we fix size_t to int truncations.
351 'msvs_disabled_warnings': [ 4267, ], 356 'msvs_disabled_warnings': [ 4267, ],
357 'export_dependent_settings': ['content'],
352 }, 358 },
353 { 359 {
354 'target_name': 'content_child', 360 'target_name': 'content_child',
355 'type': 'none', 361 'type': 'none',
356 'dependencies': ['content'], 362 'dependencies': ['content'],
357 }, 363 },
358 { 364 {
359 'target_name': 'content_gpu', 365 'target_name': 'content_gpu',
360 'type': 'none', 366 'type': 'none',
361 'dependencies': ['content'], 367 'dependencies': ['content'],
(...skipping 12 matching lines...) Expand all
374 }, 380 },
375 { 381 {
376 'target_name': 'content_renderer', 382 'target_name': 'content_renderer',
377 'type': 'none', 383 'type': 'none',
378 'dependencies': ['content'], 384 'dependencies': ['content'],
379 }, 385 },
380 { 386 {
381 'target_name': 'content_utility', 387 'target_name': 'content_utility',
382 'type': 'none', 388 'type': 'none',
383 'dependencies': ['content'], 389 'dependencies': ['content'],
390 'export_dependent_settings': ['content'],
384 }, 391 },
385 { 392 {
386 'target_name': 'content_worker', 393 'target_name': 'content_worker',
387 'type': 'none', 394 'type': 'none',
388 'dependencies': ['content'], 395 'dependencies': ['content'],
389 }, 396 },
390 ], 397 ],
391 }], 398 }],
392 ['OS == "android"', { 399 ['OS == "android"', {
393 'targets': [ 400 'targets': [
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 ], 570 ],
564 }, 571 },
565 ], 572 ],
566 }], 573 }],
567 ], 574 ],
568 }, 575 },
569 ], 576 ],
570 }], # OS == "android" 577 }], # OS == "android"
571 ], 578 ],
572 } 579 }
OLDNEW
« components/nacl.gyp ('K') | « components/nacl.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698