summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 21:11:55 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 21:11:55 +0000
commitfa30cf0307ba48b538cd5e2561b7fd8419a54ff0 (patch)
tree5688d218c29526134b41b308fd2c21d328dc1ba8 /o3d
parent98240004f86542ad638b7fc452b80efeecfbf29c (diff)
downloadchromium_src-fa30cf0307ba48b538cd5e2561b7fd8419a54ff0.zip
chromium_src-fa30cf0307ba48b538cd5e2561b7fd8419a54ff0.tar.gz
chromium_src-fa30cf0307ba48b538cd5e2561b7fd8419a54ff0.tar.bz2
Roll DEPS for Skia 424:428, and enable Skia SSE2 optimizations for Linux and Mac. Due to unfortunate limitations in gcc and gyp, this required creating a new static library target, skia_sse2 (see skia.gyp for the gory details). I did a search-and-replace in all .gyp files in the tree, but if there are other projects outside this tree which refer to skia.gyp, they will have to be modified as well.
This also required rolling DEPS for O3D Skia 376:428, since O3D uses chrome's skia.gyp file. Since this update brings ~25M of HTML docs, I pared the DEPS file down to just src/ and include/ (as we do in Chrome). I built O3D on 32bit Linux to test; hopefully other platforms will be ok. BUG=none TEST=green bots Review URL: http://codereview.chromium.org/402016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/DEPS9
1 files changed, 6 insertions, 3 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index f2b1e67..604e972 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -3,7 +3,7 @@ vars = {
"nixysa_rev": "61",
"chromium_rev": "28829",
"o3d_code_rev": "166",
- "skia_rev": "376",
+ "skia_rev": "428",
"gyp_rev": "749",
"gtest_rev": "329",
"gflags_rev": "30",
@@ -89,8 +89,11 @@ 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"),
+ "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"),
"v8":
"http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"),