| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'includes': [ | 5 'includes': [ |
| 6 'js_unittest_vars.gypi', | 6 'js_unittest_vars.gypi', |
| 7 ], | 7 ], |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'interactive_ui_tests', | 10 'target_name': 'interactive_ui_tests', |
| (...skipping 1855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1866 'conditions': [ | 1866 'conditions': [ |
| 1867 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 1867 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
| 1868 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | 1868 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { |
| 1869 'dependencies': [ | 1869 'dependencies': [ |
| 1870 '../base/allocator/allocator.gyp:allocator', | 1870 '../base/allocator/allocator.gyp:allocator', |
| 1871 ], | 1871 ], |
| 1872 }], | 1872 }], |
| 1873 ], | 1873 ], |
| 1874 }], | 1874 }], |
| 1875 ['chromeos == 1 or OS=="win" or OS == "mac"', { | 1875 ['chromeos == 1 or OS=="win" or OS == "mac"', { |
| 1876 'dependencies': [ |
| 1877 '../components/components.gyp:wifi_test_support', |
| 1878 ], |
| 1876 'sources': [ | 1879 'sources': [ |
| 1877 'browser/extensions/api/networking_private/networking_private_apites
t.cc', | 1880 'browser/extensions/api/networking_private/networking_private_apites
t.cc', |
| 1878 ], | 1881 ], |
| 1879 }], | 1882 }], |
| 1880 ['toolkit_views==1', { | 1883 ['toolkit_views==1', { |
| 1881 'dependencies': [ | 1884 'dependencies': [ |
| 1882 '../ui/views/views.gyp:views', | 1885 '../ui/views/views.gyp:views', |
| 1883 ], | 1886 ], |
| 1884 'sources!': [ | 1887 'sources!': [ |
| 1885 # TODO(estade): port to views. | 1888 # TODO(estade): port to views. |
| (...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2931 ['enable_webrtc==1', { | 2934 ['enable_webrtc==1', { |
| 2932 'dependencies': [ | 2935 'dependencies': [ |
| 2933 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2936 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2934 ] | 2937 ] |
| 2935 }], | 2938 }], |
| 2936 ], | 2939 ], |
| 2937 }] | 2940 }] |
| 2938 }], | 2941 }], |
| 2939 ], # 'conditions' | 2942 ], # 'conditions' |
| 2940 } | 2943 } |
| OLD | NEW |