Revert of Revert of Clean up libjingle.gyp and remove references to...

Revert of Revert of Clean up libjingle.gyp and remove references to libpeer_target_type. (patchset #1 id:1 of https://codereview.chromium.org/1025003002/)

Reason for revert:
Relanding libjingle.gyp update that removes libpeer_target_type references.  The issue on Android has been fixed.

Original issue's description:
> Revert of Clean up libjingle.gyp and remove references to libpeer_target_type. (patchset #1 id:1 of https://codereview.chromium.org/1008023002/)
>
> Reason for revert:
> See if this caused errors on Android.
>
> Original issue's description:
> > Clean up libjingle.gyp and remove references to libpeer_target_type.
> > This variable isn't supported any longer.
> >
> > BUG=446865
> >
> > Committed: https://crrev.com/fd22585c501bdd46f0a511fa5346fc9be1b85f88
> > Cr-Commit-Position: refs/heads/master@{#321371}
>
> TBR=kjellander@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=446865
>
> Committed: https://crrev.com/5e83cd0937a248f3d544800797b0dcbcba6eb13b
> Cr-Commit-Position: refs/heads/master@{#321614}

TBR=kjellander@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=446865

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

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

third_party/libjingle/libjingle.gyp

@@ -11,7 +11,6 @@
     'libjingle_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
-    'libpeer_target_type%': 'static_library',
     'webrtc_p2p': "../webrtc/p2p",
     'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
@@ -20,18 +19,19 @@
   # :jingle_all_dependent_configs in the GN build.
   'target_defaults': {
     'defines': [
+      'ENABLE_EXTERNAL_AUTH',
       'EXPAT_RELATIVE_PATH',
       'FEATURE_ENABLE_SSL',
       'GTEST_RELATIVE_PATH',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
+      'LIBPEERCONNECTION_LIB=1',
       'LOGGING_INSIDE_WEBRTC',
       'NO_MAIN_THREAD_WRAPPING',
       'NO_SOUND_SYSTEM',
       'SRTP_RELATIVE_PATH',
       'USE_WEBRTC_DEV_BRANCH',
-      'ENABLE_EXTERNAL_AUTH',
       'WEBRTC_CHROMIUM_BUILD',
     ],
     'configurations': {
@@ -174,9 +174,6 @@
       ],
     },
     'conditions': [
-      ['"<(libpeer_target_type)"=="static_library"', {
-        'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-      }],
       ['use_openssl==1', {
         'defines': [
           'SSL_USE_OPENSSL',
@@ -331,11 +328,7 @@
           'target_name': 'libjingle_webrtc_common',
           'type': 'static_library',
           'all_dependent_settings': {
-            'conditions': [
-              ['"<(libpeer_target_type)"=="static_library"', {
-                'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-              }],
-            ],
+            'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
           },
           'sources': [
             'overrides/talk/media/webrtc/webrtcexport.h',
@@ -559,20 +552,14 @@
             'overrides/init_webrtc.h',
           ],
           'dependencies': [
+            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
             'libjingle_webrtc_common',
           ],
-          'conditions': [
-            ['libpeer_target_type=="static_library"', {
-              'dependencies': [
-                '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
-              ],
-            }],
-          ],
         },
         {
           # GN version: //third_party/libjingle:libpeerconnection
           'target_name': 'libpeerconnection',
-          'type': '<(libpeer_target_type)',
+          'type': 'static_library',
           'sources': [
             # Note: sources list duplicated in GN build.
             '<(libjingle_source)/talk/media/webrtc/simulcast.cc',
@@ -593,52 +580,9 @@
             'libjingle_webrtc_common',
           ],
           'conditions': [
-            ['libpeer_target_type!="static_library"', {
-              'sources': [
-                'overrides/initialize_module.cc',
-              ],
-              'conditions': [
-                ['OS!="mac" and OS!="android"', {
-                  'sources': [
-                    'overrides/allocator_shim/allocator_proxy.cc',
-                  ],
-                }],
-              ],
-            }],
-            ['"<(libpeer_target_type)"!="static_library"', {
-              # Used to control symbol export/import.
-              'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
-            }],
-            ['OS=="win" and "<(libpeer_target_type)"!="static_library"', {
-              'link_settings': {
-                'libraries': [
-                  '-lsecur32.lib',
-                  '-lcrypt32.lib',
-                  '-liphlpapi.lib',
-                ],
-              },
-            }],
-            ['OS!="win" and "<(libpeer_target_type)"!="static_library"', {
-              'cflags': [
-                # For compatibility with how we export symbols from this
-                # target on Windows.  This also prevents the linker from
-                # picking up symbols from this target that should be linked
-                # in from other libjingle libs.
-                '-fvisibility=hidden',
-              ],
-            }],
-            ['OS=="mac" and libpeer_target_type!="static_library"', {
-              'product_name': 'libpeerconnection',
-            }],
-            ['OS=="android" and "<(libpeer_target_type)"=="static_library"', {
+            ['OS=="android"', {
               'standalone_static_library': 1,
             }],
-            ['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
       ],