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

Side by Side Diff: chrome/chrome.gyp

Issue 606075: Second set adding in Solaris as an OS option (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 10 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
« no previous file with comments | « build/build_config.h ('k') | media/media.gyp » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 'browser/debugger/devtools_remote_service.cc', 446 'browser/debugger/devtools_remote_service.cc',
447 'browser/debugger/devtools_remote_service.h', 447 'browser/debugger/devtools_remote_service.h',
448 'browser/debugger/devtools_window.cc', 448 'browser/debugger/devtools_window.cc',
449 'browser/debugger/devtools_window.h', 449 'browser/debugger/devtools_window.h',
450 'browser/debugger/extension_ports_remote_service.cc', 450 'browser/debugger/extension_ports_remote_service.cc',
451 'browser/debugger/extension_ports_remote_service.h', 451 'browser/debugger/extension_ports_remote_service.h',
452 'browser/debugger/inspectable_tab_proxy.cc', 452 'browser/debugger/inspectable_tab_proxy.cc',
453 'browser/debugger/inspectable_tab_proxy.h', 453 'browser/debugger/inspectable_tab_proxy.h',
454 ], 454 ],
455 'conditions': [ 455 'conditions': [
456 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 456 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
457 'dependencies': [ 457 'dependencies': [
458 '../build/linux/system.gyp:gtk', 458 '../build/linux/system.gyp:gtk',
459 ], 459 ],
460 }], 460 }],
461 ], 461 ],
462 }, 462 },
463 { 463 {
464 'target_name': 'plugin', 464 'target_name': 'plugin',
465 'type': '<(library)', 465 'type': '<(library)',
466 'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A', 466 'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 }], 523 }],
524 ['enable_gpu==1', { 524 ['enable_gpu==1', {
525 'dependencies': [ 525 'dependencies': [
526 '../gpu/gpu.gyp:command_buffer_service', 526 '../gpu/gpu.gyp:command_buffer_service',
527 ], 527 ],
528 'sources': [ 528 'sources': [
529 'plugin/command_buffer_stub.cc', 529 'plugin/command_buffer_stub.cc',
530 'plugin/command_buffer_stub.h', 530 'plugin/command_buffer_stub.h',
531 ], 531 ],
532 },], 532 },],
533 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 533 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
534 'dependencies': [ 534 'dependencies': [
535 '../build/linux/system.gyp:gtk', 535 '../build/linux/system.gyp:gtk',
536 ], 536 ],
537 }], 537 }],
538 ], 538 ],
539 }, 539 },
540 { 540 {
541 'target_name': 'utility', 541 'target_name': 'utility',
542 'type': '<(library)', 542 'type': '<(library)',
543 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', 543 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 '_CRT_SECURE_NO_WARNINGS', 821 '_CRT_SECURE_NO_WARNINGS',
822 '_USE_32BIT_TIME_T', 822 '_USE_32BIT_TIME_T',
823 'kXmppProductName="chromium-sync"', 823 'kXmppProductName="chromium-sync"',
824 ], 824 ],
825 'dependencies': [ 825 'dependencies': [
826 '../third_party/expat/expat.gyp:expat', 826 '../third_party/expat/expat.gyp:expat',
827 '../third_party/libjingle/libjingle.gyp:libjingle', 827 '../third_party/libjingle/libjingle.gyp:libjingle',
828 'sync_proto', 828 'sync_proto',
829 ], 829 ],
830 'conditions': [ 830 'conditions': [
831 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 831 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
832 'dependencies': [ 832 'dependencies': [
833 '../build/linux/system.gyp:gtk' 833 '../build/linux/system.gyp:gtk'
834 ], 834 ],
835 }], 835 }],
836 ], 836 ],
837 }, 837 },
838 { 838 {
839 'target_name': 'sync', 839 'target_name': 'sync',
840 'type': '<(library)', 840 'type': '<(library)',
841 'sources': [ 841 'sources': [
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 '../third_party/libjingle/libjingle.gyp:libjingle', 970 '../third_party/libjingle/libjingle.gyp:libjingle',
971 'sync_proto', 971 'sync_proto',
972 ], 972 ],
973 'conditions': [ 973 'conditions': [
974 ['OS=="win"', { 974 ['OS=="win"', {
975 'sources' : [ 975 'sources' : [
976 'browser/sync/util/data_encryption.cc', 976 'browser/sync/util/data_encryption.cc',
977 'browser/sync/util/data_encryption.h', 977 'browser/sync/util/data_encryption.h',
978 ], 978 ],
979 }], 979 }],
980 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 980 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
981 'dependencies': [ 981 'dependencies': [
982 '../build/linux/system.gyp:gtk' 982 '../build/linux/system.gyp:gtk'
983 ], 983 ],
984 'link_settings': { 984 'link_settings': {
985 'libraries': [ 985 'libraries': [
986 '-lXss', 986 '-lXss',
987 ], 987 ],
988 }, 988 },
989 }], 989 }],
990 ['OS=="mac"', { 990 ['OS=="mac"', {
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1517 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1518 }, 1518 },
1519 }, 1519 },
1520 }, 1520 },
1521 }, 1521 },
1522 }], 1522 }],
1523 ], 1523 ],
1524 }, 1524 },
1525 ]}, # 'targets' 1525 ]}, # 'targets'
1526 ], # OS=="win" 1526 ], # OS=="win"
1527 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 1527 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
1528 'targets': [{ 1528 'targets': [{
1529 'target_name': 'packed_resources', 1529 'target_name': 'packed_resources',
1530 'type': 'none', 1530 'type': 'none',
1531 'variables': { 1531 'variables': {
1532 'repack_path': '../tools/data_pack/repack.py', 1532 'repack_path': '../tools/data_pack/repack.py',
1533 }, 1533 },
1534 'actions': [ 1534 'actions': [
1535 # TODO(mark): These actions are duplicated for the Mac in the 1535 # TODO(mark): These actions are duplicated for the Mac in the
1536 # chrome_dll target. Can they be unified? 1536 # chrome_dll target. Can they be unified?
1537 # 1537 #
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 ], 1603 ],
1604 }, 1604 },
1605 { 1605 {
1606 'destination': '<(PRODUCT_DIR)', 1606 'destination': '<(PRODUCT_DIR)',
1607 'files': [ 1607 'files': [
1608 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1608 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1609 ], 1609 ],
1610 }, 1610 },
1611 ], 1611 ],
1612 }], # targets 1612 }], # targets
1613 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" 1613 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1614 ], # 'conditions' 1614 ], # 'conditions'
1615 } 1615 }
1616 1616
1617 # Local Variables: 1617 # Local Variables:
1618 # tab-width:2 1618 # tab-width:2
1619 # indent-tabs-mode:nil 1619 # indent-tabs-mode:nil
1620 # End: 1620 # End:
1621 # vim: set expandtab tabstop=2 shiftwidth=2: 1621 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698