From a2da031dc06200cf0638e253a1c8380acbbbf83f Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 5 Sep 2014 08:25:24 +0000 Subject: [PATCH] Remove use_relative_paths from DEPS This makes it possible for us to migrate to using the bot_update step on our buildbots. That would mean they'd use a Git checkout, which brings stability, speed and best of all: re-enables the DEPS-second-sync capability on our trybots that we've been lacking. bot_update currently doesn't support the use_relative_paths variable so the synced deps end up in the wrong path with it enabled. Since Chromium doesn't use it, and it doesn't pollute our DEPS file that much, I think we should switch. NOTICE: Any custom_deps entries for the solution in .gclient have to be updated to support this change, which includes the entry normally present for Valgrind binaries. The bots will need to be updated as well at the same time as landing this. BUG=3534 TESTED=Verified a local sync works. R=andrew@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13349004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7078 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 118904648a..42c9fe7b99 100644 --- a/DEPS +++ b/DEPS @@ -1,5 +1,3 @@ -use_relative_paths = True - # This file contains dependencies for WebRTC that are not shared with Chromium. # If you wish to add a dependency that is present in Chromium's src/DEPS or a # directory from the Chromium checkout, you should add it to setup_links.py @@ -22,16 +20,16 @@ vars = { deps = { # When rolling gflags, also update deps/third_party/webrtc/webrtc.DEPS/DEPS # in Chromium's repo. - "third_party/gflags/src": + Var("root_dir") + "/third_party/gflags/src": (Var("googlecode_url") % "gflags") + "/trunk/src@84", - "third_party/junit/": + Var("root_dir") + "/third_party/junit/": (Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367", } deps_os = { "win": { - "third_party/winsdk_samples/src": + Var("root_dir") + "/third_party/winsdk_samples/src": (Var("googlecode_url") % "webrtc") + "/deps/third_party/winsdk_samples_v71@3145", }, }