| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'includes': [ | 9 'includes': [ |
| 10 'chromeos_tools.gypi' | 10 'chromeos_tools.gypi' |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 'network/shill_property_handler_unittest.cc', | 538 'network/shill_property_handler_unittest.cc', |
| 539 'network/shill_property_util_unittest.cc', | 539 'network/shill_property_util_unittest.cc', |
| 540 'process_proxy/process_output_watcher_unittest.cc', | 540 'process_proxy/process_output_watcher_unittest.cc', |
| 541 'process_proxy/process_proxy_unittest.cc', | 541 'process_proxy/process_proxy_unittest.cc', |
| 542 'system/name_value_pairs_parser_unittest.cc', | 542 'system/name_value_pairs_parser_unittest.cc', |
| 543 ], | 543 ], |
| 544 'include_dirs': [ | 544 'include_dirs': [ |
| 545 '..', | 545 '..', |
| 546 ], | 546 ], |
| 547 'conditions': [ | 547 'conditions': [ |
| 548 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 548 [ 'use_allocator!="none"', { |
| 549 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use
_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | |
| 550 'dependencies': [ | 549 'dependencies': [ |
| 551 '../base/allocator/allocator.gyp:allocator', | 550 '../base/allocator/allocator.gyp:allocator', |
| 552 ], | 551 ], |
| 553 }, | 552 }, |
| 554 ], | 553 ], |
| 555 ['use_x11 == 1', { | 554 ['use_x11 == 1', { |
| 556 'dependencies': [ | 555 'dependencies': [ |
| 557 '../ui/gfx/gfx.gyp:gfx_x11', | 556 '../ui/gfx/gfx.gyp:gfx_x11', |
| 558 ], | 557 ], |
| 559 }] | 558 }] |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 ], | 598 ], |
| 600 'variables': { | 599 'variables': { |
| 601 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', | 600 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', |
| 602 'proto_out_dir': 'chromeos/cryptohome', | 601 'proto_out_dir': 'chromeos/cryptohome', |
| 603 }, | 602 }, |
| 604 'includes': ['../build/protoc.gypi'], | 603 'includes': ['../build/protoc.gypi'], |
| 605 }, | 604 }, |
| 606 | 605 |
| 607 ], | 606 ], |
| 608 } | 607 } |
| OLD | NEW |