Move llvm from deps to deps_os

Re-upload of https://codereview.chromium.org/1721943003/

TBR=bsalomon
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782793003

Review URL: https://codereview.chromium.org/1782793003

diff --git a/DEPS b/DEPS
index 5dedfe0ce99ce83b576005d504ee2a2db676c217..5369764591e7599517f60bd34d1c9dd769b91d63 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -56,13 +56,17 @@ deps = {
   "third_party/externals/shaderc2/third_party/googletest" : "https://github.com/google/googletest.git@ff07a5de0e81580547f1685e101194ed1a4fcd56",
   "third_party/externals/shaderc2/third_party/glslang" : "https://github.com/bsalomon/glslang.git@5dc8a76265ee31733b5a765e034ad7f5097a3cbe",
   "third_party/externals/shaderc2/third_party/spirv-tools" : "https://github.com/KhronosGroup/SPIRV-Tools.git@c31a31942b3697f2f71148555e5ffa298a572dbd",
+}
 
-  # xSAN bots build Clang from scratch.
-  "third_party/externals/llvm": "https://llvm.googlesource.com/llvm@release_38",
-  "third_party/externals/llvm/tools/clang": "https://llvm.googlesource.com/clang@release_38",
-  "third_party/externals/llvm/projects/compiler-rt": "https://llvm.googlesource.com/compiler-rt@release_38",
-  "third_party/externals/llvm/projects/libcxx": "https://llvm.googlesource.com/libcxx@release_38",
-  "third_party/externals/llvm/projects/libcxxabi": "https://llvm.googlesource.com/libcxxabi@release_38",
+deps_os = {
+  'llvm': {
+    # xSAN bots build Clang from scratch.
+    "third_party/externals/llvm": "https://llvm.googlesource.com/llvm@release_38",
+    "third_party/externals/llvm/tools/clang": "https://llvm.googlesource.com/clang@release_38",
+    "third_party/externals/llvm/projects/compiler-rt": "https://llvm.googlesource.com/compiler-rt@release_38",
+    "third_party/externals/llvm/projects/libcxx": "https://llvm.googlesource.com/libcxx@release_38",
+    "third_party/externals/llvm/projects/libcxxabi": "https://llvm.googlesource.com/libcxxabi@release_38",
+  }
 }
 
 recursedeps = [ "common" ]