Link with libboringssl.dylib

This commit is contained in:
Cheng Zhao 2015-04-03 11:37:27 +08:00
parent 038afadd1b
commit d9056135d7
3 changed files with 4 additions and 3 deletions

View file

@ -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:

View file

@ -10,11 +10,9 @@
['libchromiumcontent_component', {
'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/shared_library',
'libchromiumcontent_libraries%': '<(libchromiumcontent_shared_libraries)',
'libchromiumcontent_shared_libraries': [],
}, {
'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/static_library',
'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)',
'libchromiumcontent_static_libraries': [],
}],
],

@ -1 +1 @@
Subproject commit cbc562c7a9c6a2a56f3a6ba08652f5e475898d48
Subproject commit 846a13ae2234490d78568a68f07f5be95c24c0c3