diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 20:13:29 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 20:13:29 +0000 |
| commit | 140b523e33dc8c61b98ec131c4ea7aa547a3b1c6 (patch) | |
| tree | 1cc6f23561b2647565fa81d9bf45d06f820d9521 /o3d | |
| parent | 529cb2ae7100ce1db74d743d3c8cc5814a3952c4 (diff) | |
| download | chromium_src-140b523e33dc8c61b98ec131c4ea7aa547a3b1c6.zip chromium_src-140b523e33dc8c61b98ec131c4ea7aa547a3b1c6.tar.gz chromium_src-140b523e33dc8c61b98ec131c4ea7aa547a3b1c6.tar.bz2 | |
Import cairo and pixman (a dependency of cairo) into third_party/ on Win and Mac so that we can build them as static libraries.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/6473001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -5,7 +5,7 @@ vars = { # revs to match the version pulled-in by Chromium's own DEPS in the new rev. "chromium_rev": "51794", "chromium_breakpad_rev": "47985", - "o3d_code_rev": "227", + "o3d_code_rev": "229", "skia_rev": "586", "gyp_rev": "820", "gtest_rev": "408", @@ -159,6 +159,19 @@ deps_os = { "third_party/python_24": Var("chromium_trunk") + "/deps/third_party/python_24@19441", + + "third_party/pixman": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pixman@" + Var("o3d_code_rev"), + + "third_party/cairo": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cairo@" + Var("o3d_code_rev"), + }, + "mac": { + "third_party/pixman": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pixman@" + Var("o3d_code_rev"), + + "third_party/cairo": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cairo@" + Var("o3d_code_rev"), }, "unix": { # Linux, really. |