| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'jingle.gypi', | 7 'jingle.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'chromium_code': 1, | 10 'chromium_code': 1, |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 '../base/base.gyp:run_all_unittests', | 173 '../base/base.gyp:run_all_unittests', |
| 174 '../base/base.gyp:test_support_base', | 174 '../base/base.gyp:test_support_base', |
| 175 '../net/net.gyp:net', | 175 '../net/net.gyp:net', |
| 176 '../net/net.gyp:net_test_support', | 176 '../net/net.gyp:net_test_support', |
| 177 '../testing/gmock.gyp:gmock', | 177 '../testing/gmock.gyp:gmock', |
| 178 '../testing/gtest.gyp:gtest', | 178 '../testing/gtest.gyp:gtest', |
| 179 '../third_party/libjingle/libjingle.gyp:libjingle', | 179 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 180 ], | 180 ], |
| 181 }, | 181 }, |
| 182 ], | 182 ], |
| 183 'conditions': [ |
| 184 ['test_isolation_mode != "noop"', { |
| 185 'targets': [ |
| 186 { |
| 187 'target_name': 'jingle_unittests_run', |
| 188 'type': 'none', |
| 189 'dependencies': [ |
| 190 'jingle_unittests', |
| 191 ], |
| 192 'includes': [ |
| 193 '../build/isolate.gypi', |
| 194 ], |
| 195 'sources': [ |
| 196 'jingle_unittests.isolate', |
| 197 ], |
| 198 }, |
| 199 ], |
| 200 }], |
| 201 ], |
| 183 }, { # enable_webrtc!=1 and OS=="android" | 202 }, { # enable_webrtc!=1 and OS=="android" |
| 184 'targets': [ | 203 'targets': [ |
| 185 # Stub targets as Android doesn't use libjingle when webrtc is disabled. | 204 # Stub targets as Android doesn't use libjingle when webrtc is disabled. |
| 186 { | 205 { |
| 187 'target_name': 'jingle_glue', | 206 'target_name': 'jingle_glue', |
| 188 'type': 'none', | 207 'type': 'none', |
| 189 }, | 208 }, |
| 190 { | 209 { |
| 191 'target_name': 'jingle_glue_test_util', | 210 'target_name': 'jingle_glue_test_util', |
| 192 'type': 'none', | 211 'type': 'none', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 209 ], | 228 ], |
| 210 }, | 229 }, |
| 211 { | 230 { |
| 212 'target_name': 'notifier_test_util', | 231 'target_name': 'notifier_test_util', |
| 213 'type': 'none', | 232 'type': 'none', |
| 214 }, | 233 }, |
| 215 ], | 234 ], |
| 216 }], | 235 }], |
| 217 ], | 236 ], |
| 218 } | 237 } |
| OLD | NEW |