| 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 2932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2943 ], | 2943 ], |
| 2944 'includes': [ | 2944 'includes': [ |
| 2945 '../build/isolate.gypi', | 2945 '../build/isolate.gypi', |
| 2946 'angle_unittests.isolate', | 2946 'angle_unittests.isolate', |
| 2947 ], | 2947 ], |
| 2948 'sources': [ | 2948 'sources': [ |
| 2949 'angle_unittests.isolate', | 2949 'angle_unittests.isolate', |
| 2950 ], | 2950 ], |
| 2951 }, | 2951 }, |
| 2952 { | 2952 { |
| 2953 'target_name': 'content_gl_tests_run', | |
| 2954 'type': 'none', | |
| 2955 'dependencies': [ | |
| 2956 '../content/content_shell_and_tests.gyp:content_gl_tests', | |
| 2957 'chrome_run', | |
| 2958 ], | |
| 2959 'includes': [ | |
| 2960 '../build/isolate.gypi', | |
| 2961 'content_gl_tests.isolate', | |
| 2962 ], | |
| 2963 'sources': [ | |
| 2964 'content_gl_tests.isolate', | |
| 2965 ], | |
| 2966 }, | |
| 2967 { | |
| 2968 'target_name': 'gl_tests_run', | 2953 'target_name': 'gl_tests_run', |
| 2969 'type': 'none', | 2954 'type': 'none', |
| 2970 'dependencies': [ | 2955 'dependencies': [ |
| 2971 '../gpu/gpu.gyp:gl_tests', | 2956 '../gpu/gpu.gyp:gl_tests', |
| 2972 ], | 2957 ], |
| 2973 'includes': [ | 2958 'includes': [ |
| 2974 '../build/isolate.gypi', | 2959 '../build/isolate.gypi', |
| 2975 'gl_tests.isolate', | 2960 'gl_tests.isolate', |
| 2976 ], | 2961 ], |
| 2977 'sources': [ | 2962 'sources': [ |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3063 ['enable_webrtc==1', { | 3048 ['enable_webrtc==1', { |
| 3064 'dependencies': [ | 3049 'dependencies': [ |
| 3065 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3050 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3066 ] | 3051 ] |
| 3067 }], | 3052 }], |
| 3068 ], | 3053 ], |
| 3069 }] | 3054 }] |
| 3070 }], | 3055 }], |
| 3071 ], # 'conditions' | 3056 ], # 'conditions' |
| 3072 } | 3057 } |
| OLD | NEW |