| OLD | NEW | 
|    1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2009 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   'targets': [ |    9   'targets': [ | 
|   10     { |   10     { | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  372       'msvs_disabled_warnings': [ |  372       'msvs_disabled_warnings': [ | 
|  373         4244, 4554, 4018, 4102, |  373         4244, 4554, 4018, 4102, | 
|  374       ], |  374       ], | 
|  375       'mac_framework_dirs': [ |  375       'mac_framework_dirs': [ | 
|  376         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fram
     eworks', |  376         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fram
     eworks', | 
|  377       ], |  377       ], | 
|  378       'conditions': [ |  378       'conditions': [ | 
|  379         [ 'OS == "linux" or OS == "freebsd"', { |  379         [ 'OS == "linux" or OS == "freebsd"', { | 
|  380             'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], |  380             'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], | 
|  381                           ['exclude', '\\.mm?$' ] ], |  381                           ['exclude', '\\.mm?$' ] ], | 
|  382             'variables' : { |  | 
|  383               'linux_use_heapchecker%' : 0, |  | 
|  384             }, |  | 
|  385             'conditions': [ |  382             'conditions': [ | 
|  386               [ 'chromeos==1 or toolkit_views==1', { |  383               [ 'chromeos==1 or toolkit_views==1', { | 
|  387                   'sources/': [ ['include', '_chromeos\\.cc$'] ] |  384                   'sources/': [ ['include', '_chromeos\\.cc$'] ] | 
|  388                 }, |  385                 }, | 
|  389               ], |  386               ], | 
|  390               [ 'linux_use_heapchecker==1', { |  387               [ 'linux_use_tcmalloc==1', { | 
|  391                   'defines': [ |  | 
|  392                     'LINUX_USE_HEAPCHECKER', |  | 
|  393                   ], |  | 
|  394                   'direct_dependent_settings': { |  | 
|  395                     'defines': [ |  | 
|  396                       'LINUX_USE_HEAPCHECKER', |  | 
|  397                     ], |  | 
|  398                   }, |  | 
|  399                 }, |  | 
|  400               ], |  | 
|  401               # linux_use_heapchecker==1 implies linux_use_tcmalloc=1. |  | 
|  402               [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', { |  | 
|  403                   'dependencies': [ |  | 
|  404                     '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |  | 
|  405                   ], |  | 
|  406                   'defines': [ |  388                   'defines': [ | 
|  407                     'LINUX_USE_TCMALLOC', |  389                     'LINUX_USE_TCMALLOC', | 
|  408                   ], |  390                   ], | 
|  409                   'direct_dependent_settings': { |  391                   'direct_dependent_settings': { | 
|  410                     'defines': [ |  392                     'defines': [ | 
|  411                       'LINUX_USE_TCMALLOC', |  393                       'LINUX_USE_TCMALLOC', | 
|  412                     ], |  394                     ], | 
|  413                   }, |  395                   }, | 
|  414                 }, |  396                 }, | 
|  415               ], |  397               ], | 
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  677         '../testing/gmock.gyp:gmock', |  659         '../testing/gmock.gyp:gmock', | 
|  678         '../testing/gtest.gyp:gtest', |  660         '../testing/gtest.gyp:gtest', | 
|  679       ], |  661       ], | 
|  680       'conditions': [ |  662       'conditions': [ | 
|  681         ['OS == "linux" or OS == "freebsd"', { |  663         ['OS == "linux" or OS == "freebsd"', { | 
|  682           'sources/': [ ['exclude', '\\.mm?$' ] ], |  664           'sources/': [ ['exclude', '\\.mm?$' ] ], | 
|  683           'sources!': [ |  665           'sources!': [ | 
|  684             'file_version_info_unittest.cc', |  666             'file_version_info_unittest.cc', | 
|  685             'worker_pool_linux_unittest.cc', |  667             'worker_pool_linux_unittest.cc', | 
|  686           ], |  668           ], | 
 |  669           'conditions': [ | 
 |  670             [ 'linux_use_tcmalloc==1', { | 
 |  671                 'dependencies': [ | 
 |  672                   '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 
 |  673                 ], | 
 |  674               }, | 
 |  675             ], | 
 |  676           ], | 
|  687           'dependencies': [ |  677           'dependencies': [ | 
|  688             '../build/linux/system.gyp:gtk', |  678             '../build/linux/system.gyp:gtk', | 
|  689             '../build/linux/system.gyp:nss', |  679             '../build/linux/system.gyp:nss', | 
|  690             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |  680             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 
|  691           ], |  681           ], | 
|  692         }, {  # OS != "linux" and OS != "freebsd" |  682         }, {  # OS != "linux" and OS != "freebsd" | 
|  693           'sources!': [ |  683           'sources!': [ | 
|  694             'message_pump_glib_unittest.cc', |  684             'message_pump_glib_unittest.cc', | 
|  695           ] |  685           ] | 
|  696         }], |  686         }], | 
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  861       ], |  851       ], | 
|  862     }], |  852     }], | 
|  863   ], |  853   ], | 
|  864 } |  854 } | 
|  865  |  855  | 
|  866 # Local Variables: |  856 # Local Variables: | 
|  867 # tab-width:2 |  857 # tab-width:2 | 
|  868 # indent-tabs-mode:nil |  858 # indent-tabs-mode:nil | 
|  869 # End: |  859 # End: | 
|  870 # vim: set expandtab tabstop=2 shiftwidth=2: |  860 # vim: set expandtab tabstop=2 shiftwidth=2: | 
| OLD | NEW |