From 2e5192fa6aab643b6f45b79c9bb68a7cf1a23785 Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 3 Oct 2012 16:35:45 +0000
Subject: [PATCH] Add peerconnection_all.gyp to include everything. Add a dummy
 peerconnection_client target for mac so that we don't get an error when doing
 runhooks. Review URL: https://webrtc-codereview.appspot.com/855005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2865 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 peerconnection/DEPS                       | 11 ++++++++++-
 peerconnection/peerconnection.gyp         | 12 ++++++++++++
 peerconnection/peerconnection_all.gyp     | 20 ++++++++++++++++++++
 peerconnection/supplement/supplement.gypi |  1 +
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 peerconnection/peerconnection_all.gyp

diff --git a/peerconnection/DEPS b/peerconnection/DEPS
index efce4f0d5..8e09a50de 100644
--- a/peerconnection/DEPS
+++ b/peerconnection/DEPS
@@ -101,10 +101,19 @@ hooks = [
     "pattern": ".",
     "action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
   },
+  {
+    # Update the cygwin mount on Windows.
+    # This is necessary to get the correct mapping between e.g. /bin and the
+    # cygwin path on Windows. Without it we can't run bash scripts in actions.
+    # Ideally this should be solved in "pylib/gyp/msvs_emulation.py".
+    "pattern": ".",
+    "action": ["python", "trunk/build/win/setup_cygwin_mount.py",
+               "--win-only"],
+  },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
-    "action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/peerconnection.gyp"],
+    "action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/peerconnection_all.gyp"],
   },
 ]
 
diff --git a/peerconnection/peerconnection.gyp b/peerconnection/peerconnection.gyp
index 793e48346..d0bfa5dfc 100644
--- a/peerconnection/peerconnection.gyp
+++ b/peerconnection/peerconnection.gyp
@@ -12,6 +12,7 @@
     'peerconnection_sample': 'third_party/libjingle/source/talk/examples/peerconnection',
   },  
   'conditions': [
+    # TODO(wu): Merge the target for different platforms.
     ['OS=="win"', {
       'targets': [
         {
@@ -89,5 +90,16 @@
         },
       ],  # targets
     }, ],  # OS="linux"
+    # There's no peerconnection_client implementation for Mac.
+    # But add this dummy peerconnection_client target so that the runhooks
+    # won't complain.
+    ['OS=="mac"', {
+      'targets': [
+        {
+          'target_name': 'peerconnection_client',
+          'type': 'none',
+        },
+      ],
+    }, ],
   ],
 }
diff --git a/peerconnection/peerconnection_all.gyp b/peerconnection/peerconnection_all.gyp
new file mode 100644
index 000000000..ee41edec1
--- /dev/null
+++ b/peerconnection/peerconnection_all.gyp
@@ -0,0 +1,20 @@
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'targets': [
+    {   
+      'target_name': 'All', 
+      'type': 'none',   
+      'dependencies': [ 
+        'peerconnection.gyp:*',  
+        'third_party/libjingle/libjingle.gyp:*',
+      ],
+    },
+  ],
+}
diff --git a/peerconnection/supplement/supplement.gypi b/peerconnection/supplement/supplement.gypi
index 1fd012ad0..2eff0cf74 100644
--- a/peerconnection/supplement/supplement.gypi
+++ b/peerconnection/supplement/supplement.gypi
@@ -2,6 +2,7 @@
 {
   'variables': {
     'build_with_chromium': 1,
+    'clang_use_chrome_plugins': 0,
     'enable_protobuf': 1,
     'enabled_libjingle_device_manager': 1,
     'include_internal_audio_device': 1,