diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 02:02:04 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 02:02:04 +0000 |
| commit | a87770f81eeba492991165e6473ac3451751ae18 (patch) | |
| tree | 54e066b8e299f4804c30dad9ea7d69422037fb55 /DEPS | |
| parent | ecd458e5ca3d846af37660799e353e6607ba5774 (diff) | |
| download | chromium_src-a87770f81eeba492991165e6473ac3451751ae18.zip chromium_src-a87770f81eeba492991165e6473ac3451751ae18.tar.gz chromium_src-a87770f81eeba492991165e6473ac3451751ae18.tar.bz2 | |
Revert 272672 "Attempt #4: Change Skia DEPS to pull from googles..."
Waterfall Builder: iOS Simulator (dbg) is failing in bot_update since
http://build.chromium.org/p/chromium.mac/builders/iOS%20Simulator%20%28dbg%29/builds/16396
Suspecting this. Will unrevert if not.
BUG=377342
> Attempt #4: Change Skia DEPS to pull from googlesource (git)
>
> - Uploading from pure-svn and intending to commit manually to properly remove the directory from svn.
> - Includes deps_whitelist change for new Skia DEP
> - Attempt #3 failed due to Poppler license issue. This was resolved in https://skia.googlesource.com/skia/+/3056bdd2364fe1aa68f4ec7b0fe07740c3e8d123
>
> R=mkosiba@chromium.org
>
> Review URL: https://codereview.chromium.org/296903004
TBR=borenet@google.com
Review URL: https://codereview.chromium.org/297303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -45,7 +45,8 @@ vars = { "lss_revision": "26", "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "7693dbf46e9bf0159cc9032059738d418469a7ad", + "skia_revision": "14862", + "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. @@ -169,8 +170,14 @@ deps = { (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" + Var("sfntly_revision"), - "src/third_party/skia": - Var("chromium_git") + "/skia.git@" + Var("skia_revision"), + "src/third_party/skia/src": + (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"), + + "src/third_party/skia/gyp": + (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"), + + "src/third_party/skia/include": + (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"), "src/third_party/ots": (Var("googlecode_url") % "ots") + "/trunk@113", |