OLD | NEW |
---|---|
1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'variables': { | 5 'variables': { |
6 'chrome_unit_tests_sources': [ | 6 'chrome_unit_tests_sources': [ |
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this | 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this |
8 # dependency is needed to make commit bots run unit_tests on | 8 # dependency is needed to make commit bots run unit_tests on |
9 # histograms.xml changes. | 9 # histograms.xml changes. |
10 '../tools/metrics/histograms/histograms.xml', | 10 '../tools/metrics/histograms/histograms.xml', |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2144 ['enable_plugins==1 and disable_nacl==0', { | 2144 ['enable_plugins==1 and disable_nacl==0', { |
2145 'dependencies': [ | 2145 'dependencies': [ |
2146 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin', | 2146 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin', |
2147 ], | 2147 ], |
2148 }], | 2148 }], |
2149 ['toolkit_views==1', { | 2149 ['toolkit_views==1', { |
2150 'dependencies': [ | 2150 'dependencies': [ |
2151 '../ui/views/views.gyp:views', | 2151 '../ui/views/views.gyp:views', |
2152 ], | 2152 ], |
2153 }], | 2153 }], |
2154 ['enable_pepper_cdms==1', { | |
2155 'sources' : [ | |
2156 'browser/media/pepper_cdm_test_helper.cc', | |
ddorwin
2016/05/19 00:04:26
This is in a different place from the GN version.
xhwang
2016/05/20 00:22:35
In gyp it's a big test_support_common target. In G
| |
2157 'browser/media/pepper_cdm_test_helper.h', | |
2158 ], | |
2159 'dependencies': [ | |
2160 '../media/media.gyp:media', | |
2161 ], | |
2162 }], | |
2154 ], | 2163 ], |
2155 }, | 2164 }, |
2156 { | 2165 { |
2157 # GN version: //chrome/test:test_support_unit | 2166 # GN version: //chrome/test:test_support_unit |
2158 'target_name': 'test_support_unit', | 2167 'target_name': 'test_support_unit', |
2159 'type': 'static_library', | 2168 'type': 'static_library', |
2160 'dependencies': [ | 2169 'dependencies': [ |
2161 'chrome_resources.gyp:chrome_resources', | 2170 'chrome_resources.gyp:chrome_resources', |
2162 'chrome_resources.gyp:chrome_strings', | 2171 'chrome_resources.gyp:chrome_strings', |
2163 'browser', | 2172 'browser', |
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2988 'dependencies': [ | 2997 'dependencies': [ |
2989 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2998 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
2990 ], | 2999 ], |
2991 }], | 3000 }], |
2992 ], | 3001 ], |
2993 }, | 3002 }, |
2994 ], | 3003 ], |
2995 }], | 3004 }], |
2996 ], # 'conditions' | 3005 ], # 'conditions' |
2997 } | 3006 } |
OLD | NEW |