Commit 67aeadab authored by fbarchard@google.com's avatar fbarchard@google.com

chromium 152335 for build bots but yasm 154697 for upgrade and warning fix

BUG=84
TEST=gclient sync and build should work warning free.
Review URL: https://webrtc-codereview.appspot.com/793006

git-svn-id: http://libyuv.googlecode.com/svn/trunk@346 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent bb757cdc
...@@ -12,8 +12,7 @@ vars = { ...@@ -12,8 +12,7 @@ vars = {
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk", "chromium_trunk" : "http://src.chromium.org/svn/trunk",
# r154697 updates yasm to 1.2 with warning fixes. "chromium_revision": "152335",
"chromium_revision": "154697",
} }
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
...@@ -51,11 +50,12 @@ deps = { ...@@ -51,11 +50,12 @@ deps = {
From("chromium_deps", "src/third_party/libjpeg_turbo"), From("chromium_deps", "src/third_party/libjpeg_turbo"),
# Yasm assember required for libjpeg_turbo # Yasm assember required for libjpeg_turbo
# TODO(fbarchard): Switch back to chromium version.
"third_party/yasm": "third_party/yasm":
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/yasm@154708",
"third_party/yasm/source/patched-yasm": "third_party/yasm/source/patched-yasm":
From("chromium_deps", "src/third_party/yasm/source/patched-yasm"), Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@154708",
} }
deps_os = { deps_os = {
...@@ -64,9 +64,11 @@ deps_os = { ...@@ -64,9 +64,11 @@ deps_os = {
"third_party/cygwin": "third_party/cygwin":
(Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin@2672", (Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin@2672",
# Used by libjpeg-turbo # Used by libjpeg-turbo.
"third_party/yasm/binaries": # TODO(fbarchard): Remove binaries and run yasm from build folder.
From("chromium_deps", "src/third_party/yasm/binaries"), "third_party/yasm/binaries":
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@154708",
"third_party/yasm": None,
}, },
"unix": { "unix": {
"third_party/gold": "third_party/gold":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment