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 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2875 'includes': [ '../build/apk_test.gypi' ], | 2875 'includes': [ '../build/apk_test.gypi' ], |
2876 }, | 2876 }, |
2877 ], | 2877 ], |
2878 }], | 2878 }], |
2879 ['test_isolation_mode != "noop"', { | 2879 ['test_isolation_mode != "noop"', { |
2880 'targets': [ | 2880 'targets': [ |
2881 { | 2881 { |
2882 'target_name': 'unit_tests_run', | 2882 'target_name': 'unit_tests_run', |
2883 'type': 'none', | 2883 'type': 'none', |
2884 'dependencies': [ | 2884 'dependencies': [ |
2885 '../third_party/mesa/mesa.gyp:osmesa', | |
jam
2015/07/20 22:52:14
here and in other places, shouldn't this be in uni
M-A Ruel
2015/07/20 23:18:46
That's a fair question. The main difference is tha
danakj
2015/07/20 23:56:43
osmesa is dynamically loaded by GLSurface.
any un
| |
2885 'unit_tests', | 2886 'unit_tests', |
2886 ], | 2887 ], |
2887 'includes': [ | 2888 'includes': [ |
2888 '../build/isolate.gypi', | 2889 '../build/isolate.gypi', |
2889 ], | 2890 ], |
2890 'sources': [ | 2891 'sources': [ |
2891 'unit_tests.isolate', | 2892 'unit_tests.isolate', |
2892 ], | 2893 ], |
2893 'conditions': [ | 2894 'conditions': [ |
2894 ['use_x11 == 1', { | 2895 ['use_x11 == 1', { |
2895 'dependencies': [ | 2896 'dependencies': [ |
2896 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2897 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
2897 ], | 2898 ], |
2898 }], | 2899 }], |
2899 ], | 2900 ], |
2900 }, | 2901 }, |
2901 ], | 2902 ], |
2902 }], | 2903 }], |
2903 ], # 'conditions' | 2904 ], # 'conditions' |
2904 } | 2905 } |
OLD | NEW |