From 9c70462e3c65da7615b1224e62fe543c17c4ca6f Mon Sep 17 00:00:00 2001
From: Zach Anderson <zra@google.com>
Date: Thu, 24 May 2018 22:04:30 +0000
Subject: [PATCH] [vm] Roll boringssl to
 189270cd190267f5bd60cfe8f8ce7a61d07ba6f4

fixes #33229

Change-Id: I786c2f48108a3e00b3b3ef2ae8a68ddaac256fda
Reviewed-on: https://dart-review.googlesource.com/56628
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
---
 DEPS                              |  4 ++--
 build/toolchain/gcc_toolchain.gni |  6 +++---
 build/toolchain/mac/BUILD.gn      | 10 +++++-----
 build/toolchain/win/BUILD.gn      |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/DEPS b/DEPS
index e22fc1effdd..114668e6c4c 100644
--- a/DEPS
+++ b/DEPS
@@ -54,8 +54,8 @@ vars = {
   "async_tag": "2.0.7",
   "bazel_worker_tag": "v0.1.9",
   "boolean_selector_tag" : "1.0.3",
-  "boringssl_gen_rev": "344f455fd13d46f054726638e76026156ea73aa9",
-  "boringssl_rev" : "672f6fc2486745d0cabc3aaeb4e0a3cd13b37b12",
+  "boringssl_gen_rev": "fc47eaa1a245d858bae462cd64d4155605b850ea",
+  "boringssl_rev" : "189270cd190267f5bd60cfe8f8ce7a61d07ba6f4",
   "charcode_tag": "v1.1.1",
   "chrome_rev" : "19997",
   "cli_util_tag" : "0.1.2+1",
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index b21a7d1b27c..3689187f7f6 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -102,7 +102,7 @@ template("gcc_toolchain") {
       depsformat = "gcc"
       description = "CC {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -112,7 +112,7 @@ template("gcc_toolchain") {
       depsformat = "gcc"
       description = "CXX {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -123,7 +123,7 @@ template("gcc_toolchain") {
       depsformat = "gcc"
       description = "ASM {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 4ed409af76c..ef4b8a56f32 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -62,7 +62,7 @@ template("mac_toolchain") {
       depsformat = "gcc"
       description = "CC {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -72,7 +72,7 @@ template("mac_toolchain") {
       depsformat = "gcc"
       description = "CXX {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -83,7 +83,7 @@ template("mac_toolchain") {
       depsformat = "gcc"
       description = "ASM {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -93,7 +93,7 @@ template("mac_toolchain") {
       depsformat = "gcc"
       description = "OBJC {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
@@ -103,7 +103,7 @@ template("mac_toolchain") {
       depsformat = "gcc"
       description = "OBJCXX {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
       ]
     }
 
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 71c6595e5a0..b8d222acc6a 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -76,7 +76,7 @@ template("msvc_toolchain") {
       depsformat = "msvc"
       description = "CC {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
       ]
       rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
     }
@@ -93,7 +93,7 @@ template("msvc_toolchain") {
       depsformat = "msvc"
       description = "CXX {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
       ]
       rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}"
     }
@@ -101,7 +101,7 @@ template("msvc_toolchain") {
     tool("rc") {
       command = "$python_path $tool_wrapper_path rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.res",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res",
       ]
       description = "RC {{output}}"
     }
@@ -117,7 +117,7 @@ template("msvc_toolchain") {
       command = "$python_path $tool_wrapper_path asm-wrapper $env $ml $x64 {{defines}} {{include_dirs}} {{asmflags}} /c /Fo {{output}} {{source}}"
       description = "ASM {{output}}"
       outputs = [
-        "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj",
+        "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
       ]
     }