| OLD | NEW | 
|---|
| 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       'base_target': 0, | 8       'base_target': 0, | 
| 9     }, | 9     }, | 
| 10     'target_conditions': [ | 10     'target_conditions': [ | 
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 347           '..', | 347           '..', | 
| 348         ], | 348         ], | 
| 349         # These warnings are needed for the files in third_party\dmg_fp. | 349         # These warnings are needed for the files in third_party\dmg_fp. | 
| 350         'msvs_disabled_warnings': [ | 350         'msvs_disabled_warnings': [ | 
| 351           4244, 4554, 4018, 4102, | 351           4244, 4554, 4018, 4102, | 
| 352         ], | 352         ], | 
| 353         'mac_framework_dirs': [ | 353         'mac_framework_dirs': [ | 
| 354           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr
     ameworks', | 354           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr
     ameworks', | 
| 355         ], | 355         ], | 
| 356         'conditions': [ | 356         'conditions': [ | 
| 357           [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "so
     laris"', { | 357           [ 'toolkit_uses_gtk==0', { | 
| 358               'sources/': [ | 358               'sources/': [ | 
| 359                 ['exclude', '^nix/'], | 359                 ['exclude', '^nix/'], | 
| 360               ], | 360               ], | 
| 361               'sources!': [ | 361               'sources!': [ | 
| 362                 'atomicops_internals_x86_gcc.cc', | 362                 'atomicops_internals_x86_gcc.cc', | 
| 363                 'message_pump_glib.cc', | 363                 'message_pump_glib.cc', | 
| 364                 'message_pump_glib_x.cc', | 364                 'message_pump_glib_x.cc', | 
| 365               ], | 365               ], | 
| 366           }], | 366           }], | 
| 367           [ 'OS != "linux"', { | 367           [ 'OS != "linux"', { | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 399             'sources!': [ | 399             'sources!': [ | 
| 400               'event_recorder_stubs.cc', | 400               'event_recorder_stubs.cc', | 
| 401               'file_descriptor_shuffle.cc', | 401               'file_descriptor_shuffle.cc', | 
| 402               'message_pump_libevent.cc', | 402               'message_pump_libevent.cc', | 
| 403               # Not using sha1_win.cc because it may have caused a | 403               # Not using sha1_win.cc because it may have caused a | 
| 404               # regression to page cycler moz. | 404               # regression to page cycler moz. | 
| 405               'sha1_win.cc', | 405               'sha1_win.cc', | 
| 406               'string16.cc', | 406               'string16.cc', | 
| 407             ], | 407             ], | 
| 408           },], | 408           },], | 
| 409           ['OS=="freebsd" or OS=="openbsd"', { | 409           ['os_posix==1 and OS!="linux" and OS!="mac"', { | 
| 410             'sources!': [ | 410             'sources!': [ | 
| 411               'base/files/file_path_watcher_linux.cc', | 411               'files/file_path_watcher_linux.cc', | 
| 412             ], | 412             ], | 
| 413             'sources': [ | 413             'sources': [ | 
| 414               'base/files/file_path_watcher_stub.cc', | 414               'files/file_path_watcher_stub.cc', | 
| 415             ], | 415             ], | 
| 416           }], | 416           }], | 
| 417         ], | 417         ], | 
| 418       }], | 418       }], | 
| 419     ], | 419     ], | 
| 420   }, | 420   }, | 
| 421   'targets': [ | 421   'targets': [ | 
| 422     { | 422     { | 
| 423       'target_name': 'base', | 423       'target_name': 'base', | 
| 424       'type': '<(component)', | 424       'type': '<(component)', | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 435         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat
     ions', | 435         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat
     ions', | 
| 436       ], | 436       ], | 
| 437       # TODO(gregoryd): direct_dependent_settings should be shared with the | 437       # TODO(gregoryd): direct_dependent_settings should be shared with the | 
| 438       #  64-bit target, but it doesn't work due to a bug in gyp | 438       #  64-bit target, but it doesn't work due to a bug in gyp | 
| 439       'direct_dependent_settings': { | 439       'direct_dependent_settings': { | 
| 440         'include_dirs': [ | 440         'include_dirs': [ | 
| 441           '..', | 441           '..', | 
| 442         ], | 442         ], | 
| 443       }, | 443       }, | 
| 444       'conditions': [ | 444       'conditions': [ | 
| 445         [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris
     "', { | 445         [ 'toolkit_uses_gtk==1', { | 
| 446           'conditions': [ | 446           'conditions': [ | 
| 447             [ 'chromeos==1', { | 447             [ 'chromeos==1', { | 
| 448                 'sources/': [ ['include', '_chromeos\\.cc$'] ] | 448                 'sources/': [ ['include', '_chromeos\\.cc$'] ] | 
| 449               }, | 449               }, | 
| 450             ], | 450             ], | 
| 451             [ 'linux_use_tcmalloc==0', { | 451             [ 'linux_use_tcmalloc==0', { | 
| 452                 'defines': [ | 452                 'defines': [ | 
| 453                   'NO_TCMALLOC', | 453                   'NO_TCMALLOC', | 
| 454                 ], | 454                 ], | 
| 455                 'direct_dependent_settings': { | 455                 'direct_dependent_settings': { | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 470           'defines': [ | 470           'defines': [ | 
| 471             'USE_SYMBOLIZE', | 471             'USE_SYMBOLIZE', | 
| 472           ], | 472           ], | 
| 473           'cflags': [ | 473           'cflags': [ | 
| 474             '-Wno-write-strings', | 474             '-Wno-write-strings', | 
| 475           ], | 475           ], | 
| 476           'export_dependent_settings': [ | 476           'export_dependent_settings': [ | 
| 477             '../build/linux/system.gyp:gtk', | 477             '../build/linux/system.gyp:gtk', | 
| 478             '../build/linux/system.gyp:x11', | 478             '../build/linux/system.gyp:x11', | 
| 479           ], | 479           ], | 
| 480         }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != 
     "solaris" | 480         }, {  # toolkit_uses_gtk!=1 | 
| 481             'sources/': [ | 481             'sources/': [ | 
| 482               ['exclude', '/xdg_user_dirs/'], | 482               ['exclude', '/xdg_user_dirs/'], | 
| 483               ['exclude', '_nss\.cc$'], | 483               ['exclude', '_nss\.cc$'], | 
| 484             ], | 484             ], | 
| 485         }], | 485         }], | 
| 486         [ 'OS == "freebsd" or OS == "openbsd"', { | 486         [ 'OS == "freebsd" or OS == "openbsd"', { | 
| 487           'link_settings': { | 487           'link_settings': { | 
| 488             'libraries': [ | 488             'libraries': [ | 
| 489               '-L/usr/local/lib -lexecinfo', | 489               '-L/usr/local/lib -lexecinfo', | 
| 490               ], | 490               ], | 
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 620             'i18n/icu_util_nacl_win64.cc', | 620             'i18n/icu_util_nacl_win64.cc', | 
| 621           ], | 621           ], | 
| 622           'configurations': { | 622           'configurations': { | 
| 623             'Common_Base': { | 623             'Common_Base': { | 
| 624               'msvs_target_platform': 'x64', | 624               'msvs_target_platform': 'x64', | 
| 625             }, | 625             }, | 
| 626           }, | 626           }, | 
| 627         }, | 627         }, | 
| 628       ], | 628       ], | 
| 629     }], | 629     }], | 
| 630     [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', 
     { | 630     [ 'os_posix==1 and OS!="mac"', { | 
| 631       'targets': [ | 631       'targets': [ | 
| 632         { | 632         { | 
| 633           'target_name': 'symbolize', | 633           'target_name': 'symbolize', | 
| 634           'type': '<(library)', | 634           'type': '<(library)', | 
| 635           'variables': { | 635           'variables': { | 
| 636             'chromium_code': 0, | 636             'chromium_code': 0, | 
| 637           }, | 637           }, | 
| 638           'conditions': [ | 638           'conditions': [ | 
| 639             [ 'OS == "solaris"', { | 639             [ 'OS == "solaris"', { | 
| 640               'include_dirs': [ | 640               'include_dirs': [ | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 679             'third_party/xdg_mime/xdgmimemagic.c', | 679             'third_party/xdg_mime/xdgmimemagic.c', | 
| 680             'third_party/xdg_mime/xdgmimemagic.h', | 680             'third_party/xdg_mime/xdgmimemagic.h', | 
| 681             'third_party/xdg_mime/xdgmimeparent.c', | 681             'third_party/xdg_mime/xdgmimeparent.c', | 
| 682             'third_party/xdg_mime/xdgmimeparent.h', | 682             'third_party/xdg_mime/xdgmimeparent.h', | 
| 683           ], | 683           ], | 
| 684         }, | 684         }, | 
| 685       ], | 685       ], | 
| 686     }], | 686     }], | 
| 687   ], | 687   ], | 
| 688 } | 688 } | 
| OLD | NEW | 
|---|