Revert of Making WebRTC Java api avaliable in Chromium. (patchset #5 id:100001 of https://codereview.chromium.org/551793003/)

Reason for revert:
This CL breaks official Chrome.

Original issue's description:
> Making WebRTC Java api avaliable in Chromium.
>
> BUG=383418
> TEST=Build target libjingle_peerconnection_javalib
>
> Committed: https://crrev.com/e65a8cbe2e8b0634a66715b3959b418431f4d0c0
> Cr-Commit-Position: refs/heads/master@{#297801}

TBR=hellner@chromium.org,kjellander@chromium.org,serya@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=383418

Review URL: https://codereview.chromium.org/614263007

Cr-Commit-Position: refs/heads/master@{#297816}

3 files changed, 5 insertions, 89 deletions

diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index fb01a64..02c2bf9 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -553,40 +553,6 @@ if (enable_webrtc) {
     ]
   }
 
-  source_set("libjingle_peerconnection_so") {
-    sources = [
-      "source/talk/app/webrtc/java/jni/peerconnection_jni.cc",
-    ]
-    deps = [
-      "libjingle_webrtc",
-      "libpeerconnection",
-    ]
-  }
-
-  android_library("libjingle_peerconnection_java") {
-    java_files = [
-      "source/talk/app/webrtc/java/src/org/webrtc/AudioSource.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/AudioTrack.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/DataChannel.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/IceCandidate.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/Logging.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/MediaConstraints.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/MediaSource.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/MediaStream.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/MediaStreamTrack.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/SdpObserver.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/StatsObserver.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/StatsReport.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/SessionDescription.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/VideoCapturer.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/VideoRenderer.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/VideoSource.java",
-      "source/talk/app/webrtc/java/src/org/webrtc/VideoTrack.java",
-    ]
-  }
-
 }  # enable_webrtc
 
 # TODO(GYP): Port libjingle.gyp's enable_webrtc condition block.
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 5444c83..0eaf86c 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -574,9 +574,9 @@
           ],
         },
         {
-          # GN version: //third_party/libjingle:libpeerconnection (shared with ':libpeerconnection')
-          'target_name': 'libjingle_mediaengine',
-          'type': 'static_library',
+          # GN version: //third_party/libjingle:libpeerconnection
+          'target_name': 'libpeerconnection',
+          'type': '<(libpeer_target_type)',
           'sources': [
             # Note: sources list duplicated in GN build.
             '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
@@ -589,27 +589,13 @@
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
           ],
           'dependencies': [
-            'libjingle_webrtc_common',
+            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
             '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
-          ],
-        },
-        {
-          # GN version: //third_party/libjingle:libpeerconnection
-          'target_name': 'libpeerconnection',
-          'type': '<(libpeer_target_type)',
-          'dependencies': [
-            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<@(libjingle_peerconnection_additional_deps)',
-            'libjingle_mediaengine',
+            'libjingle_webrtc_common',
           ],
           'conditions': [
-            ['libpeer_target_type=="static_library" and OS=="mac"', {
-              # TODO(serya): Temporary workaround for crbug.com/418915. Remove when fixed.
-              'sources': [
-                'overrides/empty.cc',
-              ]
-            }],
             ['libpeer_target_type!="static_library"', {
               'sources': [
                 'overrides/initialize_module.cc',
@@ -660,35 +646,5 @@
         },  # target libpeerconnection
       ],
     }],
-    ['enable_webrtc==1 and OS=="android"', {
-      'targets': [
-        {
-          # GN version: //third_party/libjingle:libjingle_peerconnection_so
-          'target_name': 'libjingle_peerconnection_so',
-          'type': 'shared_library',
-          'dependencies': [
-            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:field_trial_default',
-            'libjingle_mediaengine',
-          ],
-          'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-          'sources': [
-            '<(libjingle_source)/talk/app/webrtc/java/jni/peerconnection_jni.cc',
-          ],
-        },
-        {
-          # GN version: //third_party/libjingle:libjingle_peerconnection_java
-          'target_name': 'libjingle_peerconnection_javalib',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': '<(libjingle_source)/talk/app/webrtc/java',
-          },
-          'dependencies': [
-            'libjingle_peerconnection_so',
-          ],
-          'includes': [ '../../build/java.gypi' ],
-        },
-      ],
-    }],
   ],
 }
diff --git a/third_party/libjingle/overrides/empty.cc b/third_party/libjingle/overrides/empty.cc
deleted file mode 100644
index 07e2562..0000000
--- a/third_party/libjingle/overrides/empty.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(serya): Temporary workaround for https://crbug.com/418915.
-// To be removed when fixed.