Revert of Making WebRTC Java api avaliable in Chromium.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 5444c83bcb619a667d0c30c8e5d144df7c9aba9d..0eaf86c3594f29dbf924728aae7db5ed24dc28cb 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' ],
-        },
-      ],
-    }],
   ],
 }