| 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 1850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1861 'conditions': [ | 1861 'conditions': [ |
| 1862 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 1862 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
| 1863 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | 1863 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { |
| 1864 'dependencies': [ | 1864 'dependencies': [ |
| 1865 '../base/allocator/allocator.gyp:allocator', | 1865 '../base/allocator/allocator.gyp:allocator', |
| 1866 ], | 1866 ], |
| 1867 }], | 1867 }], |
| 1868 ], | 1868 ], |
| 1869 }], | 1869 }], |
| 1870 ['chromeos == 1 or OS=="win" or OS == "mac"', { | 1870 ['chromeos == 1 or OS=="win" or OS == "mac"', { |
| 1871 'dependencies': [ |
| 1872 '../components/components.gyp:wifi_test_support', |
| 1873 ], |
| 1871 'sources': [ | 1874 'sources': [ |
| 1872 'browser/extensions/api/networking_private/networking_private_apites
t.cc', | 1875 'browser/extensions/api/networking_private/networking_private_apites
t.cc', |
| 1873 ], | 1876 ], |
| 1874 }], | 1877 }], |
| 1875 ['toolkit_views==1', { | 1878 ['toolkit_views==1', { |
| 1876 'dependencies': [ | 1879 'dependencies': [ |
| 1877 '../ui/views/views.gyp:views', | 1880 '../ui/views/views.gyp:views', |
| 1878 ], | 1881 ], |
| 1879 'sources!': [ | 1882 'sources!': [ |
| 1880 # TODO(estade): port to views. | 1883 # TODO(estade): port to views. |
| (...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2917 ['enable_webrtc==1', { | 2920 ['enable_webrtc==1', { |
| 2918 'dependencies': [ | 2921 'dependencies': [ |
| 2919 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2922 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2920 ] | 2923 ] |
| 2921 }], | 2924 }], |
| 2922 ], | 2925 ], |
| 2923 }] | 2926 }] |
| 2924 }], | 2927 }], |
| 2925 ], # 'conditions' | 2928 ], # 'conditions' |
| 2926 } | 2929 } |
| OLD | NEW |