From b9ddf0eb316bf8233b8c8b2f52ac11eaa0ffeda4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Apr 2015 16:28:38 +0800
Subject: [PATCH] Still link with shared_library of boringssl

---
 brightray/brightray.gyp             | 4 ++++
 brightray/vendor/libchromiumcontent | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 0d0b330abf..9eded99d15 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -122,6 +122,9 @@
         ['OS=="mac" and libchromiumcontent_component==0', {
           'link_settings': {
             'libraries': [
+              # This library is built as shared library to avoid symbols
+              # conflict with Node.
+              '<(libchromiumcontent_dir)/libboringssl.dylib',
               # ui_base.gypi:
               '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
               # net.gypi:
@@ -162,6 +165,7 @@
         ['OS=="win" and libchromiumcontent_component==0', {
           'link_settings': {
             'libraries': [
+              '<(libchromiumcontent_dir)/boringssl.lib',
               '<(libchromiumcontent_dir)/ffmpegsumo.lib',
               '<(libchromiumcontent_dir)/libyuv.lib',
               # content_browser.gypi:
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index b371f0a7b0..97917e7904 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit b371f0a7b0c1dd47d68f6ea5bade36451a13e7e1
+Subproject commit 97917e790421e8617ce685a1e32cf98a64052f7a