From 8a9f0f4e4da71ceb547db148b7b824f71461b87f Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 31 Aug 2012 00:17:53 +0000
Subject: [PATCH] * Update to the peerconnection client to use jsep01.
 (Chromium 153489.) * Remove the peerconnection_server target from
 peerconnection.gyp since we have it in libjingle.gyp. * Add
 enabled_libjingle_device_manager in supplement.gypi to add devicemanger to
 stand alone build. * Add link settings to base.gyp which is needed by the new
 changes in peerconnection_client.

Note: Resolving hostname function has some problem on Windows in this revision.
So with this revision the peerconnection client can only take ip address directly as
the server address on Windows.
Review URL: https://webrtc-codereview.appspot.com/753008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2689 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 peerconnection/DEPS                       |  4 ++--
 peerconnection/base/base.gyp              | 18 +++++++++++++++++-
 peerconnection/peerconnection.gyp         | 23 +----------------------
 peerconnection/supplement/supplement.gypi |  5 +++--
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/peerconnection/DEPS b/peerconnection/DEPS
index e38c240281..efce4f0d56 100644
--- a/peerconnection/DEPS
+++ b/peerconnection/DEPS
@@ -3,10 +3,10 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "139469",
+  "chromium_revision": "153489",
   # Still needs the libjingle_revision here because some of
   # the deps have to be pulled from libjingle repository.
-  "libjingle_revision": "145",
+  "libjingle_revision": "175",
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/peerconnection/base/base.gyp b/peerconnection/base/base.gyp
index aa75e00cc2..b077b344c1 100644
--- a/peerconnection/base/base.gyp
+++ b/peerconnection/base/base.gyp
@@ -1,9 +1,25 @@
-# This is a dummy gyp file to satisfy libjingle.gyp.
+# Below are normally provided by Chromium's base.gyp and required for
+# libjingle.gyp.
 {
   'targets': [
     {
       'target_name': 'base',
       'type': 'none',
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '..',
+        ],
+      },
+      'conditions': [
+        ['OS == "linux"', {
+          'link_settings': {
+            'libraries': [
+              # We need rt for clock_gettime() used in libjingle.
+              '-lrt',
+            ],
+          },
+        }],
+      ],
     },
   ],
 }
diff --git a/peerconnection/peerconnection.gyp b/peerconnection/peerconnection.gyp
index 76413dd281..e9c1df9ec5 100644
--- a/peerconnection/peerconnection.gyp
+++ b/peerconnection/peerconnection.gyp
@@ -11,25 +11,6 @@
   'variables': {
     'peerconnection_sample': 'third_party/libjingle/source/talk/examples/peerconnection',
   },  
-
-  'targets': [
-    {
-      'target_name': 'peerconnection_server',
-      'type': 'executable',
-      'sources': [
-        '<(peerconnection_sample)/server/data_socket.cc',
-        '<(peerconnection_sample)/server/data_socket.h',
-        '<(peerconnection_sample)/server/main.cc',
-        '<(peerconnection_sample)/server/peer_channel.cc',
-        '<(peerconnection_sample)/server/peer_channel.h',
-        '<(peerconnection_sample)/server/utils.cc',
-        '<(peerconnection_sample)/server/utils.h',
-      ],
-      'include_dirs': [
-        'third_party/libjingle/source',
-      ],
-    },
-  ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
@@ -82,14 +63,13 @@
             '<(peerconnection_sample)/client/peer_connection_client.h',
           ],
           'dependencies': [
+            'third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
             'third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
             # TODO(tommi): Switch to this and remove specific gtk dependency
             # sections below for cflags and link_settings.
             # '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'include_dirs': [
-            'src',
-            'src/modules/interface',
             'third_party/libjingle/source',
           ],
           'cflags': [
@@ -109,5 +89,4 @@
       ],  # targets
     }, ],  # OS="linux"
   ],
-
 }
diff --git a/peerconnection/supplement/supplement.gypi b/peerconnection/supplement/supplement.gypi
index eec450e0ea..1fd012ad03 100644
--- a/peerconnection/supplement/supplement.gypi
+++ b/peerconnection/supplement/supplement.gypi
@@ -2,10 +2,11 @@
 {
   'variables': {
     'build_with_chromium': 1,
-    'include_pulse_audio': 1,
+    'enable_protobuf': 1,
+    'enabled_libjingle_device_manager': 1,
     'include_internal_audio_device': 1,
     'include_internal_video_capture': 1,
     'include_internal_video_render': 1,
-    'enable_protobuf': 1,
+    'include_pulse_audio': 1,
   }
 }