diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:36:45 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:36:45 +0000 |
| commit | 70fa9c81ec1c7d93274269a8d127711dd4dea508 (patch) | |
| tree | 0d36aad5f9e5539e6c95e539f28c1a0db6703ccf /o3d/DEPS | |
| parent | da68b9fde339b1e133651d8019013bb56d29c8c3 (diff) | |
| download | chromium_src-70fa9c81ec1c7d93274269a8d127711dd4dea508.zip chromium_src-70fa9c81ec1c7d93274269a8d127711dd4dea508.tar.gz chromium_src-70fa9c81ec1c7d93274269a8d127711dd4dea508.tar.bz2 | |
Reverting the O3D changes from 32206 and 32266, due to MacOS build problems with Chrome base.
(Sorry for the trouble. I didn't realize that O3D had a separate DEPS entry for chromium, so none of this was actually necessary ... sigh).
Note: when you do roll forward chromium past 32206, you'll have to roll skia to 428 at the same time.
BUG=none
TEST=please be green
TBR=gspencer
Review URL: http://codereview.chromium.org/404018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/DEPS')
| -rw-r--r-- | o3d/DEPS | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,9 +1,9 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", "nixysa_rev": "61", - "chromium_rev": "32206", + "chromium_rev": "28829", "o3d_code_rev": "166", - "skia_rev": "428", + "skia_rev": "376", "gyp_rev": "749", "gtest_rev": "329", "gflags_rev": "30", @@ -89,11 +89,8 @@ deps = { "third_party/zlib": Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"), - "third_party/skia/src": - "http://skia.googlecode.com/svn/trunk/src@" + Var("skia_rev"), - - "third_party/skia/include": - "http://skia.googlecode.com/svn/trunk/include@" + Var("skia_rev"), + "third_party/skia": + "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"), "v8": "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"), |