Revert of Making WebRTC Java api avaliable in Chromium.

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
@@ skipping 556 matching lines @@
           'type': 'static_library',
           'sources': [
             'overrides/init_webrtc.cc',
             'overrides/init_webrtc.h',
           ],
           'dependencies': [
             'libjingle_webrtc_common',
           ],
         },
         {
-          # 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',
             '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
             '<(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',
               ],
               'conditions': [
                 ['OS!="mac" and OS!="android"', {
                   'sources': [
                     'overrides/allocator_shim/allocator_proxy.cc',
                   ],
                 }],
@@ skipping 30 matching lines @@
             ['OS=="linux" and libpeer_target_type!="static_library"', {
               # The installer and various tools depend on finding the .so
               # in this directory and not lib.target as will otherwise be
               # the case with make builds.
               'product_dir': '<(PRODUCT_DIR)/lib',
             }],
           ],
         },  # 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' ],
-        },
-      ],
-    }],
   ],
 }