Chromium Code Reviews| 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 'linux_link_kerberos%': 0, | 9 'linux_link_kerberos%': 0, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 1656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1667 [ 'enable_built_in_dns!=1', { | 1667 [ 'enable_built_in_dns!=1', { |
| 1668 'sources!': [ | 1668 'sources!': [ |
| 1669 'dns/address_sorter_posix_unittest.cc', | 1669 'dns/address_sorter_posix_unittest.cc', |
| 1670 'dns/address_sorter_unittest.cc', | 1670 'dns/address_sorter_unittest.cc', |
| 1671 ], | 1671 ], |
| 1672 }, | 1672 }, |
| 1673 ], | 1673 ], |
| 1674 [ 'use_v8_in_net==1', { | 1674 [ 'use_v8_in_net==1', { |
| 1675 'dependencies': [ | 1675 'dependencies': [ |
| 1676 'net_with_v8', | 1676 'net_with_v8', |
| 1677 '../v8/tools/gyp/v8.gyp:v8', | |
|
eroman
2013/01/18 19:21:14
why is this necessary? doesn't it already pick thi
Sven Panne
2013/01/21 08:50:06
Without this, 2 builder failed, see the try jobs f
| |
| 1677 ], | 1678 ], |
| 1678 }, { # else: !use_v8_in_net | 1679 }, { # else: !use_v8_in_net |
| 1679 'sources!': [ | 1680 'sources!': [ |
| 1680 'proxy/proxy_resolver_v8_unittest.cc', | 1681 'proxy/proxy_resolver_v8_unittest.cc', |
| 1681 ], | 1682 ], |
| 1682 }, | 1683 }, |
| 1683 ], | 1684 ], |
| 1684 [ 'OS == "win"', { | 1685 [ 'OS == "win"', { |
| 1685 'sources!': [ | 1686 'sources!': [ |
| 1686 'dns/dns_config_service_posix_unittest.cc', | 1687 'dns/dns_config_service_posix_unittest.cc', |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1808 ], | 1809 ], |
| 1809 'sources': [ | 1810 'sources': [ |
| 1810 'cookies/cookie_monster_perftest.cc', | 1811 'cookies/cookie_monster_perftest.cc', |
| 1811 'disk_cache/disk_cache_perftest.cc', | 1812 'disk_cache/disk_cache_perftest.cc', |
| 1812 'proxy/proxy_resolver_perftest.cc', | 1813 'proxy/proxy_resolver_perftest.cc', |
| 1813 ], | 1814 ], |
| 1814 'conditions': [ | 1815 'conditions': [ |
| 1815 [ 'use_v8_in_net==1', { | 1816 [ 'use_v8_in_net==1', { |
| 1816 'dependencies': [ | 1817 'dependencies': [ |
| 1817 'net_with_v8', | 1818 'net_with_v8', |
| 1819 '../v8/tools/gyp/v8.gyp:v8', | |
|
eroman
2013/01/18 19:21:14
See question above.
Sven Panne
2013/01/21 08:50:06
See comment above. :)
| |
| 1818 ], | 1820 ], |
| 1819 }, { # else: !use_v8_in_net | 1821 }, { # else: !use_v8_in_net |
| 1820 'sources!': [ | 1822 'sources!': [ |
| 1821 'proxy/proxy_resolver_perftest.cc', | 1823 'proxy/proxy_resolver_perftest.cc', |
| 1822 ], | 1824 ], |
| 1823 }, | 1825 }, |
| 1824 ], | 1826 ], |
| 1825 # This is needed to trigger the dll copy step on windows. | 1827 # This is needed to trigger the dll copy step on windows. |
| 1826 # TODO(mark): Specifying this here shouldn't be necessary. | 1828 # TODO(mark): Specifying this here shouldn't be necessary. |
| 1827 [ 'OS == "win"', { | 1829 [ 'OS == "win"', { |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2435 '--result', '<@(_outputs)', | 2437 '--result', '<@(_outputs)', |
| 2436 '--isolate', 'net_unittests.isolate', | 2438 '--isolate', 'net_unittests.isolate', |
| 2437 ], | 2439 ], |
| 2438 }, | 2440 }, |
| 2439 ], | 2441 ], |
| 2440 }, | 2442 }, |
| 2441 ], | 2443 ], |
| 2442 }], | 2444 }], |
| 2443 ], | 2445 ], |
| 2444 } | 2446 } |
| OLD | NEW |