andrew@webrtc.org aa1278de46 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

2014-02-11 18:22:29 +00:00

..

adb_shell.sh

Correct adb_shell runtime error on buildbot

2012-10-23 22:24:56 +00:00

apk_tests_noop.gyp

Remove metrics_unittests

2013-12-18 13:27:37 +00:00

apk_tests.gyp

Remove metrics_unittests

2013-12-18 13:27:37 +00:00

arm_neon.gypi

Move src/ -> webrtc/

2012-10-22 18:19:23 +00:00

common.gypi

Use libvpx's obj_int_extract and unpack_lib_posix to generate offset header file.

2014-02-11 04:48:27 +00:00

extra_gitignore.py

Fix relative path to .gitignore and other minor changes.

2013-06-07 15:43:04 +00:00

find_depot_tools.py

Roll chromium_revision 245382:249215

2014-02-09 18:38:31 +00:00

gyp_webrtc

Add gyp_webrtc script to generate projects.

2014-01-31 09:34:51 +00:00

gyp_webrtc.py

Add gyp_webrtc script to generate projects.

2014-01-31 09:34:51 +00:00

ios-webrtc.sh

Enable ObjC build by default and reenable 64-bit mac libjingle build

2013-08-26 19:31:21 +00:00

isolate.gypi

Roll chromium_revision 245382:249215

2014-02-09 18:38:31 +00:00

merge_libs.gyp

Rename merged webrtc lib to libwebrtc_merged.a.

2014-02-11 18:22:29 +00:00

merge_libs.py

Exclude protoc objects from merge_libs.py.

2014-01-16 00:31:57 +00:00

merge_voice_libs.gyp

Rename voice_engine_core -> voice_engine and move targets to voice_engine.gyp.

2013-05-29 00:38:02 +00:00

no_op.cc

Move src/ -> webrtc/

2012-10-22 18:19:23 +00:00

OWNERS

Add owners to [webrtc,talk]/build and *.isolate (take 2)

2013-10-04 19:36:45 +00:00

protoc.gypi

Roll chromium_revision 245382:249215

2014-02-09 18:38:31 +00:00

version.py

Move src/ -> webrtc/

2012-10-22 18:19:23 +00:00

vie-webrtc.sh

The video capture module for iOS.

2013-08-14 22:07:04 +00:00