diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-10-06 01:03:18 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-10-06 01:03:18 +0000 |
| commit | 3ce62fcfe474c08281c5d22977df7c10a8d768b0 (patch) | |
| tree | 3abc660b338b63368079db45e0912ab77a5eec08 /webrtc.gyp | |
| parent | af57de006ac9dbb7b25bf83e1bae2d8da4359923 (diff) | |
| download | webrtc-3ce62fcfe474c08281c5d22977df7c10a8d768b0.tar.gz | |
Move merge_libs targets to their own gyp.
The main reason is to depend on all ("*") targets in voice_engine.gyp and video_engine.gyp. We don't want the merge_lib targets building by default, since they do funny stuff like delete some libraries.
Review URL: http://webrtc-codereview.appspot.com/191003
git-svn-id: http://webrtc.googlecode.com/svn/trunk@699 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
| -rw-r--r-- | webrtc.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webrtc.gyp b/webrtc.gyp index ee8c14e928..fe97e8fafd 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -20,11 +20,8 @@ #'src/common_video/common_video.gyp:*', #'src/modules/modules.gyp:*', #'src/system_wrappers/source/system_wrappers.gyp:*', - # TODO(andrew): move the merge_lib targets to a private gyp so we can - # target "*" in these. - 'src/video_engine/video_engine.gyp:vie_auto_test', - 'src/voice_engine/voice_engine.gyp:voe_auto_test', - 'src/voice_engine/voice_engine.gyp:voe_cmd_test', + 'src/video_engine/video_engine.gyp:*', + 'src/voice_engine/voice_engine.gyp:*', ], }, # TODO(andrew): move peerconnection to its own gyp. |