diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 03:30:32 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 03:30:32 +0000 |
| commit | 5c280ecd5762494809cd5ade5e018bb867a01fc9 (patch) | |
| tree | 946dae34272437c68196e3672fa9809f00538f6f /.gitignore | |
| parent | 5fcddf2334832c8fed3f45621175ba48ef1c0580 (diff) | |
| download | webrtc-5c280ecd5762494809cd5ade5e018bb867a01fc9.tar.gz | |
Revert 4382 "Makes webrtc and libjingle build from the same gyp-..."
Failures: breaks build bots. Will have to disable Android NDK build for libjingle. The TSAN issues are in webrtc which should be unaffected. Flakey? Here are the failing tests:
http://chromegw/i/internal.client.webrtc/builders/Android%20NDK/builds/303 and http://chromegw/i/internal.client.webrtc/builders/Linux%20Tsan/builds/284
> Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches. Also disables 64 bit Mac builds for libjingle
>
> BUG=1932
> TESTED=git try
> R=andrew@webrtc.org, fischman@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/1836004
TBR=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1834005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4383 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index a96f2f2562..17d8f835e7 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,7 @@ /third_party/gold /third_party/google-gflags/src /third_party/google-visualization-python -/third_party/icu /third_party/jsoncpp -/third_party/junit /third_party/libjingle /third_party/libjpeg /third_party/libjpeg_turbo @@ -62,10 +60,8 @@ /third_party/libyuv /third_party/llvm-build /third_party/oauth2 -/third_party/openssl /third_party/opus /third_party/protobuf -/third_party/sqlite /third_party/valgrind /third_party/winsdk_samples/src /third_party/yasm |