summaryrefslogtreecommitdiffstats
path: root/o3d/DEPS_gyp
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 22:22:50 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 22:22:50 +0000
commit756797e2e4aab2c78ee3fa4bd855447ee62eb9af (patch)
tree4c6389b38419ad1508798c3fe7236d296bb4fc95 /o3d/DEPS_gyp
parent8cc7fa0c8c5f01bdcd485bd0908a1e0493722033 (diff)
downloadchromium_src-756797e2e4aab2c78ee3fa4bd855447ee62eb9af.zip
chromium_src-756797e2e4aab2c78ee3fa4bd855447ee62eb9af.tar.gz
chromium_src-756797e2e4aab2c78ee3fa4bd855447ee62eb9af.tar.bz2
This updates some of the dependencies that we need for GYP, to
accomodate changes in the Chrome tree. Review URL: http://codereview.chromium.org/174185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/DEPS_gyp')
-rw-r--r--o3d/DEPS_gyp24
1 files changed, 16 insertions, 8 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 044f194..d699ebb 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -2,9 +2,9 @@ vars = {
"chromium_trunk": "http://src.chromium.org/svn/trunk",
"nixysa_rev": "29",
"chromium_rev": "22547",
- "o3d_code_rev": "113",
+ "o3d_code_rev": "119",
"skia_rev": "279",
- "gyp_rev": "596",
+ "gyp_rev": "601",
"gtest_rev": "267",
"gflags_rev": "30",
"breakpad_rev": "346",
@@ -51,18 +51,18 @@ deps = {
# Stuff from the Chromium tree.
- "third_party/skia":
- "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
-
- "third_party/libevent":
- Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
-
"third_party/boost":
Var("chromium_trunk") + "/src/third_party/boost@" + Var("chromium_rev"),
+ "third_party/harfbuzz":
+ Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"),
+
"third_party/icu38":
Var("chromium_trunk") + "/deps/third_party/icu38@" + Var("icu38_rev"),
+ "third_party/libevent":
+ Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
+
"third_party/libjpeg":
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"),
@@ -72,6 +72,9 @@ deps = {
"third_party/zlib":
Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
+ "third_party/skia":
+ "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
+
"v8":
"http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"),
@@ -133,6 +136,11 @@ deps_os = {
"third_party/python_24":
Var("chromium_trunk") + "/deps/third_party/python_24@19441",
},
+ "unix": {
+ # Linux, really.
+ "site_scons":
+ Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"),
+ },
}
hooks = [