Roll Chromium 238260 -> 243863 R=andrew@webrtc.org, henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/6939004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5385 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/DEPS b/DEPS index ad92bc6..5138aca 100644 --- a/DEPS +++ b/DEPS
@@ -11,7 +11,7 @@ "googlecode_url": "http://%s.googlecode.com/svn", "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "238260", + "chromium_revision": "243863", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", @@ -23,6 +23,9 @@ "../chromium_deps": File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")), + "../chromium_gn": + File(Var("chromium_trunk") + "/src/.gn@" + Var("chromium_revision")), + "build": Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"), @@ -95,6 +98,9 @@ "tools/clang": Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"), + "tools/gn": + Var("chromium_trunk") + "/src/tools/gn@" + Var("chromium_revision"), + "tools/gyp": From("chromium_deps", "src/tools/gyp"), @@ -195,6 +201,59 @@ hooks = [ { + # Copy .gn from temporary place (../chromium_gn) to root_dir. + "name": "copy .gn", + "pattern": ".", + "action": ["python", Var("root_dir") + "/build/cp.py", + Var("root_dir") + "/../chromium_gn/.gn", + Var("root_dir")], + }, + # Pull GN binaries. This needs to be before running GYP below. + { + "name": "gn_win", + "pattern": "tools/gn/bin/win/gn.exe.sha1", + "action": [ "download_from_google_storage", + "--no_resume", + "--platform=win32", + "--no_auth", + "--bucket", "chromium-gn", + "-s", Var("root_dir") + "/tools/gn/bin/win/gn.exe.sha1", + ], + }, + { + "name": "gn_mac", + "pattern": "tools/gn/bin/mac/gn.sha1", + "action": [ "download_from_google_storage", + "--no_resume", + "--platform=darwin", + "--no_auth", + "--bucket", "chromium-gn", + "-s", Var("root_dir") + "/tools/gn/bin/mac/gn.sha1", + ], + }, + { + "name": "gn_linux", + "pattern": "tools/gn/bin/linux/gn.sha1", + "action": [ "download_from_google_storage", + "--no_resume", + "--platform=linux*", + "--no_auth", + "--bucket", "chromium-gn", + "-s", Var("root_dir") + "/tools/gn/bin/linux/gn.sha1", + ], + }, + { + "name": "gn_linux32", + "pattern": "tools/gn/bin/linux/gn32.sha1", + "action": [ "download_from_google_storage", + "--no_resume", + "--platform=linux*", + "--no_auth", + "--bucket", "chromium-gn", + "-s", Var("root_dir") + "/tools/gn/bin/linux/gn32.sha1", + ], + }, + { # Create a supplement.gypi file under trunk/webrtc. This file will be picked # up by gyp and used to enable the standalone build. "pattern": ".",