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

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,
     'libjingle_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
-    'libpeer_target_type%': 'static_library',
     'webrtc_p2p': "../webrtc/p2p",
     'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
   # Most of these settings have been split according to their scope into
   # :jingle_unexported_configs, :jingle_direct_dependent_configs,
   # :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': {
       'Debug': {
         'defines': [
           # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
           # _DEBUG and remove this define. See below as well.
           '_DEBUG',
         ],
       }
@@ skipping 122 matching lines @@
         }
       },
     },
     'variables': {
       'clang_warning_flags_unset': [
         # Don't warn about string->bool used in asserts.
         '-Wstring-conversion',
       ],
     },
     'conditions': [
-      ['"<(libpeer_target_type)"=="static_library"', {
-        'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-      }],
       ['use_openssl==1', {
         'defines': [
           'SSL_USE_OPENSSL',
           'HAVE_OPENSSL_SSL_H',
         ],
         'dependencies': [
           '../../third_party/boringssl/boringssl.gyp:boringssl',
         ],
       }, {
         'defines': [
@@ skipping 134 matching lines @@
     }, # target peerconnection_server
   ],
   'conditions': [
     ['enable_webrtc==1', {
       'targets': [
         {
           # GN version: //third_party/libjingle:libjingle_webrtc_common
           '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',
 
             '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
             '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
             '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.cc',
             '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.h',
             '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
             '<(libjingle_source)/talk/app/webrtc/datachannel.h',
@@ skipping 203 matching lines @@
         },  # target libjingle_webrtc_common
         {
           # GN version: //third_party/libjingle:libjingle_webrtc
           'target_name': 'libjingle_webrtc',
           'type': 'static_library',
           'sources': [
             'overrides/init_webrtc.cc',
             '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',
             '<(libjingle_source)/talk/media/webrtc/simulcast.h',
             '<(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': [
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
             '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
             '<@(libjingle_peerconnection_additional_deps)',
             '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
       ],
     }],
   ],
 }