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/webrtc@4383 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc.gyp b/webrtc.gyp
deleted file mode 100644
index 086d483..0000000
--- a/webrtc.gyp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
- 'includes': ['build/common.gypi',],
- 'variables': {
- 'webrtc_all_dependencies': [
- 'common_audio/common_audio.gyp:*',
- 'common_video/common_video.gyp:*',
- 'modules/modules.gyp:*',
- 'system_wrappers/source/system_wrappers.gyp:*',
- 'video_engine/video_engine.gyp:*',
- 'voice_engine/voice_engine.gyp:*',
- '<(webrtc_vp8_dir)/vp8.gyp:*',
- ],
- },
- 'targets': [
- {
- 'target_name': 'webrtc',
- 'type': 'none',
- 'dependencies': [
- '<@(webrtc_all_dependencies)',
- ],
- 'conditions': [
- ['include_tests==1', {
- 'dependencies': [
- 'system_wrappers/source/system_wrappers_tests.gyp:*',
- 'test/metrics.gyp:*',
- 'test/test.gyp:*',
- 'tools/tools.gyp:*',
- '../tools/e2e_quality/e2e_quality.gyp:*',
- ],
- }],
- ['OS=="android"', {
- 'dependencies': [
- '../tools/android/android_tools_precompiled.gyp:*',
- '../tools/android-dummy-test/android_dummy_test.gyp:*',
- ],
- }],
- ],
- },
- ],
-}
