Chromium Code Reviews| Index: webrtc/webrtc.gyp |
| diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp |
| index 6f90833a28bc796bd0a7f43e18f0c6e04f701ceb..f1a404267d72ac49b36f0b6450627281b66477f2 100644 |
| --- a/webrtc/webrtc.gyp |
| +++ b/webrtc/webrtc.gyp |
| @@ -35,6 +35,17 @@ |
| ], |
| }, |
| }], |
| + ['OS=="ios" and build_with_chromium==0', { |
|
kjellander_webrtc
2016/04/22 20:08:09
What about if (OS=="mac" and mac_deployment_target
tkchin_webrtc
2016/04/26 21:26:24
Done.
|
| + # TODO(kjellander): Move this to webrtc_all_dependencies once all of talk/ |
| + # has been moved to webrtc/. It can't be processed by Chromium since the |
| + # reference to buid/java.gypi is using an absolute path (and includes |
| + # entries cannot contain variables). |
| + 'variables': { |
| + 'webrtc_all_dependencies': [ |
| + 'sdk/sdk.gyp:*', |
| + ], |
| + }, |
| + }], |
| ['include_tests==1', { |
| 'includes': [ |
| 'webrtc_tests.gypi', |
| @@ -97,6 +108,12 @@ |
| 'webrtc_tests', |
| ], |
| }], |
| + ['include_tests==1 and' |
| + '(OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7"))', { |
| + 'dependencies': [ |
| + 'sdk/sdk_tests.gyp:*', |
| + ], |
| + }], |
| ], |
| }, |
| { |