BASELINE: Update Chromium to 69.0.3497.70

Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 33 insertions, 8 deletions

diff --git a/chromium/docs/win_cross.md b/chromium/docs/win_cross.md
index c2639740675..f5479c394ba 100644
--- a/chromium/docs/win_cross.md
+++ b/chromium/docs/win_cross.md
@@ -35,16 +35,41 @@ cross builds ([.asm bug](https://crbug.com/762167)).
 1. `gclient sync`, follow instructions on screen.
 
 If you're at Google, this will automatically download the Windows SDK for you.
-If this fails with an error: Please follow the instructions at
-https://www.chromium.org/developers/how-tos/build-instructions-windows
+If this fails with an error:
+
+    Please follow the instructions at
+    https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md
+
 then you may need to re-authenticate via:
 
     cd path/to/chrome/src
     # Follow instructions, enter 0 as project id.
     download_from_google_storage --config
 
-If you are not at Google, you'll have to figure out how to get the SDK, and
-you'll need to put a JSON file describing the SDK layout in a certain location.
+If you are not at Google, you can package your Windows SDK installation
+into a zip file by running the following on a Windows machine:
+
+    cd path/to/depot_tools/win_toolchain
+    # customize the Windows SDK version numbers
+    python package_from_installed.py 2017 -w 10.0.17134.0
+
+These commands create a zip file named `<hash value>.zip`. Then, to use the
+generated file in a Linux or Mac host, the following environment variables
+need to be set:
+
+    export DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL=<path/to/sdk/zip/file>
+    export GYP_MSVS_<toolchain hash>=<hash value>
+
+`<toolchain hash>` is hardcoded in `src/build/vs_toolchain.py` and can be found by
+setting `DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL` and running `gclient sync`:
+
+    gclient sync
+    ...
+    Running hooks:  17% (11/64) win_toolchain
+    ________ running '/usr/bin/python src/build/vs_toolchain.py update --force' in <chromium dir>
+    Windows toolchain out of date or doesn't exist, updating (Pro)...
+    current_hashes:
+    desired_hash: <toolchain hash>
 
 ## GN setup
 
@@ -66,7 +91,7 @@ You can run the Windows binaries you built on swarming, like so:
 
 See the contents of run-swarmed.py for how to do this manually.
 
-There's a bot doing 64-bit release cross builds at
-https://ci.chromium.org/buildbot/chromium.clang/linux-win_cross-rel/
-which also runs tests. You can look at it to get an idea of which tests pass in
-the cross build.
+The
+[linux-win_cross-rel](https://ci.chromium.org/buildbot/chromium.clang/linux-win_cross-rel/)
+buildbot does 64-bit release cross builds, and also runs tests. You can look at
+it to get an idea of which tests pass in the cross build.