| 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 2989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3000 'unit_tests_apk.isolate', | 3000 'unit_tests_apk.isolate', |
| 3001 ], | 3001 ], |
| 3002 }, | 3002 }, |
| 3003 ], | 3003 ], |
| 3004 }], | 3004 }], |
| 3005 ], | 3005 ], |
| 3006 }], | 3006 }], |
| 3007 ['test_isolation_mode != "noop"', { | 3007 ['test_isolation_mode != "noop"', { |
| 3008 'targets': [ | 3008 'targets': [ |
| 3009 { | 3009 { |
| 3010 'target_name': 'chrome_app_unittests_run', |
| 3011 'type': 'none', |
| 3012 'dependencies': [ |
| 3013 'chrome_app_unittests', |
| 3014 ], |
| 3015 'includes': [ |
| 3016 '../build/isolate.gypi', |
| 3017 ], |
| 3018 'sources': [ |
| 3019 'chrome_app_unittests.isolate', |
| 3020 ], |
| 3021 }, |
| 3022 { |
| 3010 'target_name': 'unit_tests_run', | 3023 'target_name': 'unit_tests_run', |
| 3011 'type': 'none', | 3024 'type': 'none', |
| 3012 'dependencies': [ | 3025 'dependencies': [ |
| 3013 'unit_tests', | 3026 'unit_tests', |
| 3014 ], | 3027 ], |
| 3015 'includes': [ | 3028 'includes': [ |
| 3016 '../build/isolate.gypi', | 3029 '../build/isolate.gypi', |
| 3017 ], | 3030 ], |
| 3018 'sources': [ | 3031 'sources': [ |
| 3019 'unit_tests.isolate', | 3032 'unit_tests.isolate', |
| 3020 ], | 3033 ], |
| 3021 'conditions': [ | 3034 'conditions': [ |
| 3022 ['use_x11 == 1', { | 3035 ['use_x11 == 1', { |
| 3023 'dependencies': [ | 3036 'dependencies': [ |
| 3024 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 3037 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3025 ], | 3038 ], |
| 3026 }], | 3039 }], |
| 3027 ], | 3040 ], |
| 3028 }, | 3041 }, |
| 3029 ], | 3042 ], |
| 3030 }], | 3043 }], |
| 3031 ], # 'conditions' | 3044 ], # 'conditions' |
| 3032 } | 3045 } |
| OLD | NEW |