Chromium Code Reviews| Index: all.gyp |
| diff --git a/all.gyp b/all.gyp |
| index 0b11c8f7d66cc0588df2f7bce65ee1ad7f1734d6..a1acd9294c03b08a12f4630b7ad71b38825e62c9 100644 |
| --- a/all.gyp |
| +++ b/all.gyp |
| @@ -18,7 +18,6 @@ |
| 'type': 'none', |
| 'dependencies': [ |
| 'webrtc/webrtc.gyp:*', |
| - 'talk/libjingle.gyp:*', |
| '<@(webrtc_root_additional_dependencies)', |
| ], |
| 'conditions': [ |
| @@ -27,7 +26,7 @@ |
| 'webrtc/webrtc_examples.gyp:*', |
| ], |
| }], |
| - ['include_tests==1', { |
| + ['OS=="ios" or (OS=="mac" and target_arch!="ia32") and include_tests==1', { |
|
Taylor Brandstetter
2016/02/10 22:20:47
Could you explain the purpose of this?
kjellander_webrtc
2016/02/11 12:59:35
Yeah, it was needed since with this CL there's onl
|
| 'dependencies': [ |
| 'talk/libjingle_tests.gyp:*', |
| ], |