Index: webrtc/webrtc.gyp |
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp |
index 974ad9231b85cb3eb2256eff2299a1e9d2b1da6f..be911088d417b2077f91b4d38b5e1b480c764942 100644 |
--- a/webrtc/webrtc.gyp |
+++ b/webrtc/webrtc.gyp |
@@ -6,7 +6,35 @@ |
# in the file PATENTS. All contributing project authors may |
# be found in the AUTHORS file in the root of the source tree. |
{ |
+ 'variables': { |
+ 'webrtc_all_dependencies': [ |
+ 'base/base.gyp:*', |
+ 'sound/sound.gyp:*', |
+ 'common.gyp:*', |
+ 'common_audio/common_audio.gyp:*', |
+ 'common_video/common_video.gyp:*', |
+ 'media/media.gyp:*', |
+ 'modules/modules.gyp:*', |
+ 'p2p/p2p.gyp:*', |
+ 'system_wrappers/system_wrappers.gyp:*', |
+ 'tools/tools.gyp:*', |
+ 'voice_engine/voice_engine.gyp:*', |
+ '<(webrtc_vp8_dir)/vp8.gyp:*', |
+ '<(webrtc_vp9_dir)/vp9.gyp:*', |
+ ], |
+ }, |
'conditions': [ |
+ ['build_with_chromium==0', { |
+ # 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': [ |
+ 'api/api.gyp:*', |
+ ], |
+ }, |
+ }], |
['include_tests==1', { |
'includes': [ |
'libjingle/xmllite/xmllite_tests.gypi', |
@@ -54,23 +82,6 @@ |
'call/webrtc_call.gypi', |
'video/webrtc_video.gypi', |
], |
- 'variables': { |
- 'webrtc_all_dependencies': [ |
- 'base/base.gyp:*', |
- 'sound/sound.gyp:*', |
- 'common.gyp:*', |
- 'common_audio/common_audio.gyp:*', |
- 'common_video/common_video.gyp:*', |
- 'media/media.gyp:*', |
- 'modules/modules.gyp:*', |
- 'p2p/p2p.gyp:*', |
- 'system_wrappers/system_wrappers.gyp:*', |
- 'tools/tools.gyp:*', |
- 'voice_engine/voice_engine.gyp:*', |
- '<(webrtc_vp8_dir)/vp8.gyp:*', |
- '<(webrtc_vp9_dir)/vp9.gyp:*', |
- ], |
- }, |
'targets': [ |
{ |
'target_name': 'webrtc_all', |
@@ -82,6 +93,7 @@ |
'conditions': [ |
['include_tests==1', { |
'dependencies': [ |
+ 'api/api_tests.gyp:*', |
'common_video/common_video_unittests.gyp:*', |
'rtc_unittests', |
'system_wrappers/system_wrappers_tests.gyp:*', |
@@ -91,14 +103,6 @@ |
'webrtc_tests', |
], |
}], |
- ['OS=="ios"', { |
- 'dependencies': [ |
- # TODO(tkchin): Move this target to webrtc_all_dependencies once it |
- # has more than iOS specific targets. |
- # TODO(tkchin): Figure out where to add this in BUILD.gn. |
- 'api/api.gyp:*', |
- ], |
- }], |
], |
}, |
{ |