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

Side by Side Diff: chrome/chrome.gyp

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and added spaces, collapsed one check Created 9 years, 7 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ['chromeos==1', { 66 ['chromeos==1', {
67 'platform_locale_settings_grd': 67 'platform_locale_settings_grd':
68 'app/resources/locale_settings_cros.grd', 68 'app/resources/locale_settings_cros.grd',
69 }], 69 }],
70 ['chromeos!=1', { 70 ['chromeos!=1', {
71 'platform_locale_settings_grd': 71 'platform_locale_settings_grd':
72 'app/resources/locale_settings_linux.grd', 72 'app/resources/locale_settings_linux.grd',
73 }], 73 }],
74 ], 74 ],
75 },], 75 },],
76 ['os_posix == 1 and OS != "mac" and OS != "linux"', {
77 'platform_locale_settings_grd':
78 'app/resources/locale_settings_linux.grd',
79 },],
76 ['OS=="mac"', { 80 ['OS=="mac"', {
77 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 81 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
78 'nacl_defines': [ 82 'nacl_defines': [
79 'NACL_WINDOWS=0', 83 'NACL_WINDOWS=0',
80 'NACL_LINUX=0', 84 'NACL_LINUX=0',
81 'NACL_OSX=1', 85 'NACL_OSX=1',
82 ], 86 ],
83 'platform_locale_settings_grd': 87 'platform_locale_settings_grd':
84 'app/resources/locale_settings_mac.grd', 88 'app/resources/locale_settings_mac.grd',
85 'conditions': [ 89 'conditions': [
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 'browser/debugger/devtools_handler.h', 461 'browser/debugger/devtools_handler.h',
458 'browser/debugger/devtools_toggle_action.h', 462 'browser/debugger/devtools_toggle_action.h',
459 'browser/debugger/devtools_window.cc', 463 'browser/debugger/devtools_window.cc',
460 'browser/debugger/devtools_window.h', 464 'browser/debugger/devtools_window.h',
461 'browser/debugger/extension_ports_remote_service.cc', 465 'browser/debugger/extension_ports_remote_service.cc',
462 'browser/debugger/extension_ports_remote_service.h', 466 'browser/debugger/extension_ports_remote_service.h',
463 'browser/debugger/inspectable_tab_proxy.cc', 467 'browser/debugger/inspectable_tab_proxy.cc',
464 'browser/debugger/inspectable_tab_proxy.h', 468 'browser/debugger/inspectable_tab_proxy.h',
465 ], 469 ],
466 'conditions': [ 470 'conditions': [
467 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 471 ['toolkit_uses_gtk == 1', {
468 'dependencies': [ 472 'dependencies': [
469 '../build/linux/system.gyp:gtk', 473 '../build/linux/system.gyp:gtk',
470 ], 474 ],
471 }], 475 }],
472 ], 476 ],
473 }, 477 },
474 { 478 {
475 'target_name': 'utility', 479 'target_name': 'utility',
476 'type': '<(library)', 480 'type': '<(library)',
477 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', 481 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
478 'dependencies': [ 482 'dependencies': [
479 '../base/base.gyp:base', 483 '../base/base.gyp:base',
480 '../skia/skia.gyp:skia', 484 '../skia/skia.gyp:skia',
481 ], 485 ],
482 'sources': [ 486 'sources': [
483 'utility/utility_main.cc', 487 'utility/utility_main.cc',
484 'utility/utility_thread.cc', 488 'utility/utility_thread.cc',
485 'utility/utility_thread.h', 489 'utility/utility_thread.h',
486 ], 490 ],
487 'include_dirs': [ 491 'include_dirs': [
488 '..', 492 '..',
489 ], 493 ],
490 'conditions': [ 494 'conditions': [
491 ['OS=="linux"', { 495 ['toolkit_uses_gtk == 1', {
492 'dependencies': [ 496 'dependencies': [
493 '../build/linux/system.gyp:gtk', 497 '../build/linux/system.gyp:gtk',
494 ], 498 ],
495 }], 499 }],
496 ], 500 ],
497 }, 501 },
498 { 502 {
499 'target_name': 'profile_import', 503 'target_name': 'profile_import',
500 'type': '<(library)', 504 'type': '<(library)',
501 'dependencies': [ 505 'dependencies': [
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 # This target exports a hard dependency because its header files include 706 # This target exports a hard dependency because its header files include
703 # protobuf header files from sync_proto_cpp. 707 # protobuf header files from sync_proto_cpp.
704 'hard_dependency': 1, 708 'hard_dependency': 1,
705 'conditions': [ 709 'conditions': [
706 ['OS=="win"', { 710 ['OS=="win"', {
707 'sources' : [ 711 'sources' : [
708 'browser/sync/util/data_encryption.cc', 712 'browser/sync/util/data_encryption.cc',
709 'browser/sync/util/data_encryption.h', 713 'browser/sync/util/data_encryption.h',
710 ], 714 ],
711 }], 715 }],
712 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 716 ['toolkit_uses_gtk == 1', {
713 'dependencies': [ 717 'dependencies': [
714 '../build/linux/system.gyp:gtk', 718 '../build/linux/system.gyp:gtk',
715 ], 719 ],
716 'link_settings': { 720 'link_settings': {
717 'libraries': [ 721 'libraries': [
718 '-lXss', 722 '-lXss',
719 ], 723 ],
720 }, 724 },
721 }], 725 }],
722 ['OS=="linux" and chromeos==1', { 726 ['OS=="linux" and chromeos==1', {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 ['OS=="win"', { 837 ['OS=="win"', {
834 'defines': [ 838 'defines': [
835 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 839 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
836 # of cloud print system, and allows to use custom implementaiton. 840 # of cloud print system, and allows to use custom implementaiton.
837 'CP_PRINT_SYSTEM_AVAILABLE', 841 'CP_PRINT_SYSTEM_AVAILABLE',
838 ], 842 ],
839 'sources': [ 843 'sources': [
840 'service/cloud_print/print_system_win.cc', 844 'service/cloud_print/print_system_win.cc',
841 ], 845 ],
842 }], 846 }],
843 ['OS=="linux"', { 847 ['toolkit_uses_gtk == 1', {
844 'dependencies': [ 848 'dependencies': [
845 '../build/linux/system.gyp:gtk', 849 '../build/linux/system.gyp:gtk',
846 ], 850 ],
847 }], 851 }],
848 ['use_cups==1', { 852 ['use_cups==1', {
849 'dependencies': [ 853 'dependencies': [
850 '../printing/printing.gyp:cups', 854 '../printing/printing.gyp:cups',
851 ], 855 ],
852 'defines': [ 856 'defines': [
853 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 857 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 'tools/crash_service/main.cc', 1525 'tools/crash_service/main.cc',
1522 ], 1526 ],
1523 'msvs_settings': { 1527 'msvs_settings': {
1524 'VCLinkerTool': { 1528 'VCLinkerTool': {
1525 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1529 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1526 }, 1530 },
1527 }, 1531 },
1528 }, 1532 },
1529 ]}, # 'targets' 1533 ]}, # 'targets'
1530 ], # OS=="win" 1534 ], # OS=="win"
1531 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 1535 ['os_posix == 1 and OS != "mac"', {
1532 'targets': [{ 1536 'targets': [{
1533 'target_name': 'packed_resources', 1537 'target_name': 'packed_resources',
1534 'type': 'none', 1538 'type': 'none',
1535 'variables': { 1539 'variables': {
1536 'repack_path': '../tools/data_pack/repack.py', 1540 'repack_path': '../tools/data_pack/repack.py',
1537 }, 1541 },
1538 'actions': [ 1542 'actions': [
1539 # TODO(mark): These actions are duplicated for the Mac in the 1543 # TODO(mark): These actions are duplicated for the Mac in the
1540 # chrome_dll target. Can they be unified? 1544 # chrome_dll target. Can they be unified?
1541 # 1545 #
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 ], 1626 ],
1623 }, 1627 },
1624 { 1628 {
1625 'destination': '<(PRODUCT_DIR)', 1629 'destination': '<(PRODUCT_DIR)',
1626 'files': [ 1630 'files': [
1627 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1631 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1628 ], 1632 ],
1629 }, 1633 },
1630 ], 1634 ],
1631 }], # targets 1635 }], # targets
1632 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1636 }], # os_posix == 1 and OS != "mac"
1633 ], # 'conditions' 1637 ], # 'conditions'
1634 } 1638 }
1635 1639
1636 # Local Variables: 1640 # Local Variables:
1637 # tab-width:2 1641 # tab-width:2
1638 # indent-tabs-mode:nil 1642 # indent-tabs-mode:nil
1639 # End: 1643 # End:
1640 # vim: set expandtab tabstop=2 shiftwidth=2: 1644 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698