Revert 190016 "Reland libjingle.gyp refactoring change."

trunk/src/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%': '<(component)',
+    'libpeer_target_type%': 'static_library',
   },
   'target_defaults': {
     'defines': [
       'EXPAT_RELATIVE_PATH',
       'FEATURE_ENABLE_SSL',
       'GTEST_RELATIVE_PATH',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
       'JSONCPP_RELATIVE_PATH',
@@ skipping 458 matching lines @@
         '<(libjingle_source)/talk/xmpp/xmppengineimpl_iq.cc',
         '<(libjingle_source)/talk/xmpp/xmpplogintask.cc',
         '<(libjingle_source)/talk/xmpp/xmpplogintask.h',
         '<(libjingle_source)/talk/xmpp/xmppstanzaparser.cc',
         '<(libjingle_source)/talk/xmpp/xmppstanzaparser.h',
         '<(libjingle_source)/talk/xmpp/xmpptask.cc',
         '<(libjingle_source)/talk/xmpp/xmpptask.h',
       ],
       'dependencies': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+        'libjingle_p2p_constants',
         '<@(libjingle_additional_deps)',
-        'libjingle_media_base_constants',
-        'libjingle_p2p_base_constants',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
             '<(libjingle_source)/talk/base/schanneladapter.cc',
             '<(libjingle_source)/talk/base/schanneladapter.h',
@@ skipping 54 matching lines @@
           ],
         }],
         ['use_openssl==1', {
           'sources': [
             '<(libjingle_source)/talk/base/openssladapter.cc',
             '<(libjingle_source)/talk/base/openssldigest.cc',
             '<(libjingle_source)/talk/base/opensslidentity.cc',
             '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
           ],
         }],
-        ['enable_webrtc==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
-            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
-          ],
+      ],
+    },  # target libjingle
+    # This has to be is a separate project due to a bug in MSVS 2008 and the
+    # current toolset on android.  The problem is that we have two files named
+    # "constants.cc" and MSVS/android doesn't handle this properly.
+    # GYP currently has guards to catch this, so if you want to remove it,
+    # run GYP and if GYP has removed the validation check, then we can assume
+    # that the toolchains have been fixed (we currently use VS2010 and later,
+    # so VS2008 isn't a concern anymore).
+    {
+      'target_name': 'libjingle_p2p_constants',
+      'type': 'static_library',
+      'sources': [
+        '<(libjingle_source)/talk/p2p/base/constants.cc',
+        '<(libjingle_source)/talk/p2p/base/constants.h',
+      ],
+    },  # target libjingle_p2p_constants
+    {
+      'target_name': 'peerconnection_server',
+      'type': 'executable',
+      'sources': [
+        '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc',
+        '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h',
+        '<(libjingle_source)/talk/examples/peerconnection/server/main.cc',
+        '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc',
+        '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h',
+        '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc',
+        '<(libjingle_source)/talk/examples/peerconnection/server/utils.h',
+      ],
+      'include_dirs': [
+        '<(libjingle_source)',
+      ],
+      'dependencies': [
+        'libjingle',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4309, ],
+    }, # target peerconnection_server
+  ],
+  'conditions': [
+    ['enable_webrtc==1', {
+      'targets': [
+        {
+          'target_name': 'libpeerconnection',
+          'type': '<(libpeer_target_type)',
+          'all_dependent_settings': {
+            'conditions': [
+              ['"<(libpeer_target_type)"=="static_library"', {
+                'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
+              }],
+            ],
+          },
           'sources': [
             '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
             '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
             '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
             '<(libjingle_source)/talk/app/webrtc/datachannel.h',
             '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc',
             '<(libjingle_source)/talk/app/webrtc/dtmfsender.h',
             '<(libjingle_source)/talk/app/webrtc/jsep.h',
             '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.cc',
             '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.h',
@@ skipping 35 matching lines @@
             '<(libjingle_source)/talk/app/webrtc/webrtcsdp.cc',
             '<(libjingle_source)/talk/app/webrtc/webrtcsdp.h',
             '<(libjingle_source)/talk/app/webrtc/webrtcsession.cc',
             '<(libjingle_source)/talk/app/webrtc/webrtcsession.h',
             '<(libjingle_source)/talk/media/base/capturemanager.cc',
             '<(libjingle_source)/talk/media/base/capturemanager.h',
             '<(libjingle_source)/talk/media/base/capturerenderadapter.cc',
             '<(libjingle_source)/talk/media/base/capturerenderadapter.h',
             '<(libjingle_source)/talk/media/base/codec.cc',
             '<(libjingle_source)/talk/media/base/codec.h',
+            '<(libjingle_source)/talk/media/base/constants.cc',
+            '<(libjingle_source)/talk/media/base/constants.h',
             '<(libjingle_source)/talk/media/base/cryptoparams.h',
             '<(libjingle_source)/talk/media/base/filemediaengine.cc',
             '<(libjingle_source)/talk/media/base/filemediaengine.h',
             '<(libjingle_source)/talk/media/base/mediachannel.h',
             '<(libjingle_source)/talk/media/base/mediaengine.cc',
             '<(libjingle_source)/talk/media/base/mediaengine.h',
             '<(libjingle_source)/talk/media/base/rtpdataengine.cc',
             '<(libjingle_source)/talk/media/base/rtpdataengine.h',
             '<(libjingle_source)/talk/media/base/rtpdump.cc',
             '<(libjingle_source)/talk/media/base/rtpdump.h',
             '<(libjingle_source)/talk/media/base/rtputils.cc',
             '<(libjingle_source)/talk/media/base/rtputils.h',
             '<(libjingle_source)/talk/media/base/streamparams.cc',
             '<(libjingle_source)/talk/media/base/streamparams.h',
             '<(libjingle_source)/talk/media/base/videocapturer.cc',
             '<(libjingle_source)/talk/media/base/videocapturer.h',
             '<(libjingle_source)/talk/media/base/videocommon.cc',
             '<(libjingle_source)/talk/media/base/videocommon.h',
             '<(libjingle_source)/talk/media/base/videoframe.cc',
             '<(libjingle_source)/talk/media/base/videoframe.h',
             '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
             '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
             '<(libjingle_source)/talk/media/devices/filevideocapturer.cc',
             '<(libjingle_source)/talk/media/devices/filevideocapturer.h',
             '<(libjingle_source)/talk/media/webrtc/webrtccommon.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcpassthroughrender.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.h',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoframe.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoframe.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvie.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvoe.h',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
             '<(libjingle_source)/talk/session/media/audiomonitor.cc',
             '<(libjingle_source)/talk/session/media/audiomonitor.h',
             '<(libjingle_source)/talk/session/media/call.cc',
             '<(libjingle_source)/talk/session/media/call.h',
             '<(libjingle_source)/talk/session/media/channel.cc',
             '<(libjingle_source)/talk/session/media/channel.h',
             '<(libjingle_source)/talk/session/media/channelmanager.cc',
             '<(libjingle_source)/talk/session/media/channelmanager.h',
             '<(libjingle_source)/talk/session/media/currentspeakermonitor.cc',
             '<(libjingle_source)/talk/session/media/currentspeakermonitor.h',
@@ skipping 16 matching lines @@
             '<(libjingle_source)/talk/session/media/ssrcmuxfilter.h',
             '<(libjingle_source)/talk/session/media/typingmonitor.cc',
             '<(libjingle_source)/talk/session/media/typingmonitor.h',
             '<(libjingle_source)/talk/session/media/voicechannel.h',
             '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
             '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
             '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
             '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
           ],
           'conditions': [
+            ['"<(libpeer_target_type)"=="shared_library"', {
+              # Used to control symbol export/import.
+              'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
+            }],
+            ['OS=="win" and "<(libpeer_target_type)"=="shared_library"', {
+              'link_settings': {
+                'libraries': [
+                  '-lsecur32.lib',
+                  '-lcrypt32.lib',
+                  '-liphlpapi.lib',
+                ],
+              },
+            }],
             ['enabled_libjingle_device_manager==1', {
               'sources!': [
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
               ],
               'sources': [
                 '<(libjingle_source)/talk/media/devices/devicemanager.cc',
                 '<(libjingle_source)/talk/media/devices/devicemanager.h',
                 '<(libjingle_source)/talk/sound/nullsoundsystem.cc',
                 '<(libjingle_source)/talk/sound/nullsoundsystem.h',
@@ skipping 54 matching lines @@
                     'WARNING_CFLAGS': [
                       # Suppres warnings about using deprecated functions in
                       # macdevicemanager.cc.
                       '-Wno-deprecated-declarations',
                     ],
                   },
                 }],
               ],
             }],
           ],
-        }],
-      ],
-    },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS 2008 and the
-    # current toolset on android.  The problem is that we have two files named
-    # "constants.cc" and MSVS/android doesn't handle this properly.
-    # GYP currently has guards to catch this, so if you want to remove it,
-    # run GYP and if GYP has removed the validation check, then we can assume
-    # that the toolchains have been fixed (we currently use VS2010 and later,
-    # so VS2008 isn't a concern anymore).
-    {
-      'target_name': 'libjingle_p2p_base_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
-    },  # target libjingle_p2p_base_constants
-    {
-      'target_name': 'libjingle_media_base_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(libjingle_source)/talk/media/base/constants.cc',
-        '<(libjingle_source)/talk/media/base/constants.h',
-      ],
-    },  # target libjingle_media_base_constants
-    {
-      'target_name': 'peerconnection_server',
-      'type': 'executable',
-      'sources': [
-        '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc',
-        '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h',
-        '<(libjingle_source)/talk/examples/peerconnection/server/main.cc',
-        '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc',
-        '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h',
-        '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc',
-        '<(libjingle_source)/talk/examples/peerconnection/server/utils.h',
-      ],
-      'include_dirs': [
-        '<(libjingle_source)',
-      ],
-      'dependencies': [
-        'libjingle',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4309, ],
-    }, # target peerconnection_server
-  ],
-  'conditions': [
-    ['enable_webrtc==1', {
-      'targets': [
-        {
-          'target_name': 'libpeerconnection',
-          'type': '<(libpeer_target_type)',
-          'all_dependent_settings': {
-            'conditions': [
-              ['"<(libpeer_target_type)"=="static_library"', {
-                'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
-              }],
-            ],
-          },
-          'sources': [
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
-          ],
-          'conditions': [
-            ['"<(libpeer_target_type)"=="shared_library"', {
-              # Used to control symbol export/import.
-              'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
-            }],
-            ['OS=="win" and "<(libpeer_target_type)"=="shared_library"', {
-              'link_settings': {
-                'libraries': [
-                  '-lsecur32.lib',
-                  '-lcrypt32.lib',
-                  '-liphlpapi.lib',
-                ],
-              },
-            }],
-          ],
           'dependencies': [
+            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
+            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle',
           ],
         },  # target libpeerconnection
       ],
     }],
   ],
 }