From 6123c60bcee3913c5bf5fe1a3cb04a6802caac30 Mon Sep 17 00:00:00 2001 From: "frkoenig@google.com" Date: Tue, 4 Oct 2011 17:10:18 +0000 Subject: [PATCH] Change to using gyp_chromium for gtest dependencies. Pulling in gtest for unit testing also pulls in chromium build parts. Using the model that WebRTC does for including gtest. Review URL: http://webrtc-codereview.appspot.com/190007 git-svn-id: http://libyuv.googlecode.com/svn/trunk@10 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- DEPS | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 60197a326..e66d8d1fc 100644 --- a/DEPS +++ b/DEPS @@ -8,7 +8,15 @@ vars = { } deps = { - + "trunk/build": + Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"), + + "trunk/testing": + Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"), + + "trunk/testing/gtest": + (Var("googlecode_url") % "googletest") + "/trunk@573", + "trunk/tools/gyp": (Var("googlecode_url") % "gyp") + "/trunk@985", @@ -21,6 +29,6 @@ hooks = [ # A change to a .gyp, .gypi, or to GYP itself should run the generator. { "pattern": ".", - "action": ["python", "trunk/tools/gyp/gyp", "--depth=.", "trunk/libyuv.gyp"], + "action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/libyuv.gyp"], }, ]