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

Side by Side Diff: chrome/chrome_common.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_common_target': 0, 8 'chrome_common_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 'common/safe_browsing/client_model.proto', 423 'common/safe_browsing/client_model.proto',
424 'common/safe_browsing/csd.proto' 424 'common/safe_browsing/csd.proto'
425 ], 425 ],
426 'variables': { 426 'variables': {
427 'proto_in_dir': 'common/safe_browsing', 427 'proto_in_dir': 'common/safe_browsing',
428 'proto_out_dir': 'chrome/common/safe_browsing', 428 'proto_out_dir': 'chrome/common/safe_browsing',
429 }, 429 },
430 'includes': [ '../build/protoc.gypi' ], 430 'includes': [ '../build/protoc.gypi' ],
431 }, 431 },
432 ], 432 ],
433 'conditions': [
434 ['OS=="win"', {
435 'targets': [
436 {
437 'target_name': 'common_nacl_win64',
438 'type': 'static_library',
439 'variables': {
440 'chrome_common_target': 1,
441 },
442 'dependencies': [
443 # TODO(gregoryd): chrome_resources and chrome_strings could be
444 # shared with the 32-bit target, but it does not work due to a gyp
445 # issue.
446 'chrome_resources',
447 'chrome_strings',
448 'common_constants_win64',
449 'app/policy/cloud_policy_codegen.gyp:policy_win64',
450 '../base/base.gyp:base_nacl_win64',
451 '../ipc/ipc.gyp:ipc_win64',
452 '../third_party/libxml/libxml.gyp:libxml',
453 '../ui/ui.gyp:ui_nacl_win64',
454 '../ui/ui.gyp:ui_resources',
455 '../ui/ui.gyp:ui_resources_standard',
456 ],
457 'include_dirs': [
458 '../third_party/icu/public/i18n',
459 '../third_party/icu/public/common',
460 # We usually get these skia directories by adding a dependency on
461 # skia, bu we don't need it for NaCl's 64-bit Windows support. The
462 # directories are required for resolving the includes in any case.
463 '../third_party/skia/include/config',
464 '../third_party/skia/include/core',
465 '../skia/config',
466 '../skia/config/win',
467 ],
468 'defines': [
469 '<@(nacl_win64_defines)',
470 ],
471 'sources': [
472 '../webkit/glue/webkit_glue_dummy.cc',
473 'common/url_constants.cc',
474 # TODO(bradnelson): once automatic generation of 64 bit targets on
475 # Windows is ready, take this out and add a dependency on
476 # content_common.gypi.
477 '../content/common/file_system/file_system_dispatcher_dummy.cc',
478 '../content/common/message_router.cc',
479 '../content/common/quota_dispatcher_dummy.cc',
480 '../content/common/resource_dispatcher_dummy.cc',
481 '../content/common/socket_stream_dispatcher_dummy.cc',
482 ],
483 'export_dependent_settings': [
484 'app/policy/cloud_policy_codegen.gyp:policy_win64',
485 ],
486 # TODO(gregoryd): This could be shared with the 32-bit target, but
487 # it does not work due to a gyp issue.
488 'direct_dependent_settings': {
489 'include_dirs': [
490 '..',
491 ],
492 },
493 'configurations': {
494 'Common_Base': {
495 'msvs_target_platform': 'x64',
496 },
497 },
498 },
499 ],
500 }],
501 ],
502 } 433 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_dll.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698