From 36b6331216503477595100c6454d544dc84ddc93 Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 9 May 2012 23:22:30 +0000
Subject: [PATCH] * Add gold as deps. * Stop using the webrtc_deps as a
 workaround for a potential depot_tools bug   where getting two DEPS file
 using File(...) was not handled properly.   See crbug.com/127479 for detail.
 Review URL: https://webrtc-codereview.appspot.com/579006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2208 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 peerconnection/DEPS | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/peerconnection/DEPS b/peerconnection/DEPS
index ff348b873..dd0f3998c 100644
--- a/peerconnection/DEPS
+++ b/peerconnection/DEPS
@@ -4,9 +4,8 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
   "chromium_revision": "134666",
-  # Still needs the webrtc_revision/libjingle_revision here because some of
-  # the deps have to be pulled from webrtc/libjingle repository.
-  "webrtc_revision": "2137",
+  # Still needs the libjingle_revision here because some of
+  # the deps have to be pulled from libjingle repository.
   "libjingle_revision": "136",
 }
 
@@ -16,9 +15,6 @@ deps = {
   "trunk/chromium_deps":
     File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
 
-  "trunk/webrtc_deps":
-    File((Var("googlecode_url") % "webrtc") + "/trunk/DEPS@" + Var("webrtc_revision")),
-
   "trunk/third_party/webrtc":
     From("trunk/chromium_deps", "src/third_party/webrtc"),
 
@@ -27,7 +23,7 @@ deps = {
     From("trunk/chromium_deps", "src/third_party/libvpx"),
 
   "trunk/build":
-    From("trunk/webrtc_deps", "trunk/build"),
+    Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
 
   "trunk/testing/gtest":
     From("trunk/chromium_deps", "src/testing/gtest"),
@@ -35,24 +31,27 @@ deps = {
   "trunk/tools/gyp":
     From("trunk/chromium_deps", "src/tools/gyp"),
 
+  "trunk/tools/clang":
+    Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
+
   # Needed by build/common.gypi.
   "trunk/tools/win/supalink":
-    From("trunk/webrtc_deps", "trunk/tools/win/supalink"),
+    Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
 
-  "trunk/third_party/protobuf/":
-    From("trunk/webrtc_deps", "trunk/third_party/protobuf"),
+  "trunk/third_party/protobuf":
+    Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
 
   "trunk/third_party/libjpeg_turbo/":
     From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"),
 
-  "trunk/third_party/libjpeg/":
-    From("trunk/webrtc_deps", "trunk/third_party/libjpeg"),
+  "trunk/third_party/libjpeg":
+    Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
 
-  "trunk/third_party/yasm/":
-    From("trunk/webrtc_deps", "trunk/third_party/yasm"),
+  "trunk/third_party/yasm":
+    Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
 
-  "trunk/third_party/expat/":
-    From("trunk/webrtc_deps", "trunk/third_party/expat"),
+  "trunk/third_party/expat":
+    Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
 
   "trunk/third_party/yasm/source/patched-yasm":
     From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"),
@@ -89,9 +88,19 @@ deps_os = {
     "trunk/third_party/yasm/binaries":
       From("trunk/chromium_deps", "src/third_party/yasm/binaries"),
   },
+  "unix": {
+    "trunk/third_party/gold":
+      From("trunk/chromium_deps", "src/third_party/gold"),
+  },
 }
 
 hooks = [
+  {
+    # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
+    # zero seconds to run. If something changed, it downloads a prebuilt clang.
+    "pattern": ".",
+    "action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
+  },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",