From 0cc36377a57ee9b7847c2e3a301a92938e730f8d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Apr 2015 22:56:21 +0800
Subject: [PATCH] win: Ignore duplicate symbols between BoringSSL and OpenSSL

---
 common.gypi      | 3 +++
 vendor/brightray | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common.gypi b/common.gypi
index c737efd8be6b..cbf3d14da25a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -191,6 +191,9 @@
       },
       'VCLinkerTool': {
         'AdditionalOptions': [
+          # Force linking even though we have duplicate symbols between
+          # BoringSSL and OpenSSL.
+          '/FORCE:MULTIPLE',
           # ATL 8.0 included in WDK 7.1 makes the linker to generate following
           # warnings:
           #   - warning LNK4254: section 'ATL' (50000040) merged into
diff --git a/vendor/brightray b/vendor/brightray
index ae360b94fff5..616ce9051fef 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit ae360b94fff5a25222b3a535aad8bb4e7cd3b992
+Subproject commit 616ce9051fef9896651686aa9a0b6403caa4e1a8