Rename merged webrtc lib to libwebrtc_merged.a.

The name "libwebrtc.a" was conflicting with the newish webrtc target,
resulting in this error:
$ ./webrtc/build/gyp_webrtc merged_lib.gyp
$ ninja -C out/Debug
ninja: warning: multiple rules generate libwebrtc.a. builds involving
this target will not be correct; continuing anyway
ninja: error: dependency cycle: no_op -> libwebrtc.a -> no_op

BUG=b/12955740
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8409005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5528 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2014-02-11 18:22:29 +00:00
parent 8685af7ea0
commit aa1278de46

View File

@ -31,7 +31,7 @@
'actions': [
{
'variables': {
'output_lib_name': 'webrtc',
'output_lib_name': 'webrtc_merged',
'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)<(STATIC_LIB_SUFFIX)',
},
'action_name': 'merge_libs',