Chromium Code Reviews| 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 2825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2836 'browser_tests', | 2836 'browser_tests', |
| 2837 'chrome', | 2837 'chrome', |
| 2838 ], | 2838 ], |
| 2839 'includes': [ | 2839 'includes': [ |
| 2840 '../build/isolate.gypi', | 2840 '../build/isolate.gypi', |
| 2841 'browser_tests.isolate', | 2841 'browser_tests.isolate', |
| 2842 ], | 2842 ], |
| 2843 'sources': [ | 2843 'sources': [ |
| 2844 'browser_tests.isolate', | 2844 'browser_tests.isolate', |
| 2845 ], | 2845 ], |
| 2846 'conditions': [ | |
| 2847 ['use_x11==1', { | |
| 2848 'dependencies': [ | |
| 2849 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | |
| 2850 ], | |
| 2851 }], | |
| 2852 ], | |
| 2846 }, | 2853 }, |
| 2847 { | 2854 { |
| 2848 'target_name': 'content_gl_tests_run', | 2855 'target_name': 'content_gl_tests_run', |
| 2849 'type': 'none', | 2856 'type': 'none', |
| 2850 'dependencies': [ | 2857 'dependencies': [ |
| 2851 '../content/content_shell_and_tests.gyp:content_gl_tests', | 2858 '../content/content_shell_and_tests.gyp:content_gl_tests', |
| 2852 'chrome_run', | 2859 'chrome_run', |
| 2853 ], | 2860 ], |
| 2854 'includes': [ | 2861 'includes': [ |
| 2855 '../build/isolate.gypi', | 2862 '../build/isolate.gypi', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2887 'gl_tests.isolate', | 2894 'gl_tests.isolate', |
| 2888 ], | 2895 ], |
| 2889 }, | 2896 }, |
| 2890 { | 2897 { |
| 2891 'target_name': 'interactive_ui_tests_run', | 2898 'target_name': 'interactive_ui_tests_run', |
| 2892 'type': 'none', | 2899 'type': 'none', |
| 2893 'dependencies': [ | 2900 'dependencies': [ |
| 2894 'interactive_ui_tests', | 2901 'interactive_ui_tests', |
| 2895 ], | 2902 ], |
| 2896 'conditions': [ | 2903 'conditions': [ |
| 2897 ['use_x11 == 1', { | 2904 ['use_x11 == 1', { |
|
Peter Mayo
2014/07/11 18:19:56
e.g. here.
| |
| 2898 'dependencies': [ | 2905 'dependencies': [ |
| 2899 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2906 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2900 ], | 2907 ], |
| 2901 }], | 2908 }], |
| 2902 ], | 2909 ], |
| 2903 'includes': [ | 2910 'includes': [ |
| 2904 '../build/isolate.gypi', | 2911 '../build/isolate.gypi', |
| 2905 'interactive_ui_tests.isolate', | 2912 'interactive_ui_tests.isolate', |
| 2906 ], | 2913 ], |
| 2907 'sources': [ | 2914 'sources': [ |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2993 ['enable_webrtc==1', { | 3000 ['enable_webrtc==1', { |
| 2994 'dependencies': [ | 3001 'dependencies': [ |
| 2995 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3002 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2996 ] | 3003 ] |
| 2997 }], | 3004 }], |
| 2998 ], | 3005 ], |
| 2999 }] | 3006 }] |
| 3000 }], | 3007 }], |
| 3001 ], # 'conditions' | 3008 ], # 'conditions' |
| 3002 } | 3009 } |
| OLD | NEW |