Don't link with shared_librayr of boringssl in Release mode
This commit is contained in:
parent
88b6a60c29
commit
dfa6fedaed
4 changed files with 6 additions and 34 deletions
16
atom.gyp
16
atom.gyp
|
@ -125,9 +125,7 @@
|
||||||
'<@(libchromiumcontent_shared_v8_libraries)',
|
'<@(libchromiumcontent_shared_v8_libraries)',
|
||||||
],
|
],
|
||||||
}, {
|
}, {
|
||||||
'copied_libraries': [
|
'copied_libraries': [],
|
||||||
'<(libchromiumcontent_dir)/boringssl.dll',
|
|
||||||
],
|
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
@ -172,7 +170,6 @@
|
||||||
}, {
|
}, {
|
||||||
'copied_libraries': [
|
'copied_libraries': [
|
||||||
'<(PRODUCT_DIR)/lib/libnode.so',
|
'<(PRODUCT_DIR)/lib/libnode.so',
|
||||||
'<(libchromiumcontent_dir)/libboringssl.so',
|
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
|
@ -422,7 +419,6 @@
|
||||||
}, {
|
}, {
|
||||||
'copied_libraries': [
|
'copied_libraries': [
|
||||||
'<(PRODUCT_DIR)/libnode.dylib',
|
'<(PRODUCT_DIR)/libnode.dylib',
|
||||||
'<(libchromiumcontent_dir)/libboringssl.dylib'
|
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
|
@ -442,16 +438,6 @@
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'postbuilds': [
|
'postbuilds': [
|
||||||
{
|
|
||||||
'postbuild_name': 'Fix path of libboringssl',
|
|
||||||
'action': [
|
|
||||||
'install_name_tool',
|
|
||||||
'-change',
|
|
||||||
'/usr/local/lib/libboringssl.dylib',
|
|
||||||
'@rpath/libboringssl.dylib',
|
|
||||||
'${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
'postbuild_name': 'Fix path of libnode',
|
'postbuild_name': 'Fix path of libnode',
|
||||||
'action': [
|
'action': [
|
||||||
|
|
|
@ -26,7 +26,6 @@ TARGET_BINARIES = {
|
||||||
],
|
],
|
||||||
'win32': [
|
'win32': [
|
||||||
'atom.exe',
|
'atom.exe',
|
||||||
'boringssl.dll',
|
|
||||||
'content_shell.pak',
|
'content_shell.pak',
|
||||||
'd3dcompiler_47.dll',
|
'd3dcompiler_47.dll',
|
||||||
'ffmpegsumo.dll',
|
'ffmpegsumo.dll',
|
||||||
|
@ -44,7 +43,6 @@ TARGET_BINARIES = {
|
||||||
'atom',
|
'atom',
|
||||||
'content_shell.pak',
|
'content_shell.pak',
|
||||||
'icudtl.dat',
|
'icudtl.dat',
|
||||||
'libboringssl.so',
|
|
||||||
'libffmpegsumo.so',
|
'libffmpegsumo.so',
|
||||||
'libnode.so',
|
'libnode.so',
|
||||||
'natives_blob.bin',
|
'natives_blob.bin',
|
||||||
|
@ -118,16 +116,6 @@ def copy_chromedriver():
|
||||||
shutil.copyfile(src, dest)
|
shutil.copyfile(src, dest)
|
||||||
os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
|
os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
|
||||||
|
|
||||||
# Fix the linking with boringssl.
|
|
||||||
if TARGET_PLATFORM == 'linux':
|
|
||||||
execute(['chrpath', '-r', '$ORIGIN', dest])
|
|
||||||
elif TARGET_PLATFORM == 'darwin':
|
|
||||||
shutil.copy2(os.path.join(CHROMIUM_DIR, 'libboringssl.dylib'), DIST_DIR)
|
|
||||||
execute(['install_name_tool', '-change',
|
|
||||||
'/usr/local/lib/libboringssl.dylib',
|
|
||||||
'@loader_path/libboringssl.dylib',
|
|
||||||
dest])
|
|
||||||
|
|
||||||
|
|
||||||
def copy_license():
|
def copy_license():
|
||||||
shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
|
shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
|
||||||
|
@ -186,11 +174,9 @@ def create_chromedriver_zip():
|
||||||
with scoped_cwd(DIST_DIR):
|
with scoped_cwd(DIST_DIR):
|
||||||
files = ['LICENSE']
|
files = ['LICENSE']
|
||||||
if TARGET_PLATFORM == 'win32':
|
if TARGET_PLATFORM == 'win32':
|
||||||
files += ['chromedriver.exe', 'boringssl.dll']
|
files += ['chromedriver.exe']
|
||||||
elif TARGET_PLATFORM == 'darwin':
|
else:
|
||||||
files += ['chromedriver', 'libboringssl.dylib']
|
files += ['chromedriver']
|
||||||
elif TARGET_PLATFORM == 'linux':
|
|
||||||
files += ['chromedriver', 'libboringssl.so']
|
|
||||||
make_zip(zip_file, files, [])
|
make_zip(zip_file, files, [])
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import platform
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
|
BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
|
||||||
LIBCHROMIUMCONTENT_COMMIT = '0718fa8b44e004a39ee2511858abbef1dae89cef'
|
LIBCHROMIUMCONTENT_COMMIT = 'f1ad1412461ba3345a27cfe935ffc872dba0ac5b'
|
||||||
|
|
||||||
ARCH = {
|
ARCH = {
|
||||||
'cygwin': '32bit',
|
'cygwin': '32bit',
|
||||||
|
|
2
vendor/brightray
vendored
2
vendor/brightray
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 0f37e5fa4d5273f80c91d485e0ce6edef683a26e
|
Subproject commit 14b4dc7151ded676d7133f0da17033149a4954df
|
Loading…
Add table
Add a link
Reference in a new issue