Update BoringSSL
This commit is contained in:
63
third_party/boringssl/boringssl.gyp
vendored
63
third_party/boringssl/boringssl.gyp
vendored
@@ -77,44 +77,20 @@
|
||||
],
|
||||
}, { # asm_target_arch!="none"
|
||||
'conditions': [
|
||||
['OS=="linux" or OS=="android"', {
|
||||
'conditions': [
|
||||
['asm_target_arch=="x86"', {
|
||||
'sources': [
|
||||
'<@(boringssl_linux_x86_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch in {"x86-64", "x64"}', {
|
||||
'sources': [
|
||||
'<@(boringssl_linux_x86_64_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm"', {
|
||||
'sources': [
|
||||
'<@(boringssl_linux_arm_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm64"', {
|
||||
'sources': [
|
||||
'<@(boringssl_linux_aarch64_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="ppc64"', {
|
||||
'sources': [
|
||||
'<@(boringssl_linux_ppc64le_files)',
|
||||
],
|
||||
}],
|
||||
['OS=="linux" or OS=="android" or OS=="mac" or OS=="ios"', {
|
||||
'sources': [
|
||||
'<@(boringssl_crypto_asm_files)',
|
||||
],
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'sources': [
|
||||
'<@(boringssl_crypto_nasm_files)',
|
||||
],
|
||||
'conditions': [
|
||||
# TODO: This doesn't allow building the Debug/Release
|
||||
# configurations with x86-64, it requires using the
|
||||
# Debug_x64/Release_x64 configurations.
|
||||
['asm_target_arch=="x86"', {
|
||||
'sources': [
|
||||
'<@(boringssl_win_x86_files)',
|
||||
],
|
||||
'variables': {
|
||||
'nasm_flags': [
|
||||
'-fwin32',
|
||||
@@ -122,9 +98,6 @@
|
||||
},
|
||||
}],
|
||||
['asm_target_arch in {"x86-64", "x64"}', {
|
||||
'sources': [
|
||||
'<@(boringssl_win_x86_64_files)',
|
||||
],
|
||||
'variables': {
|
||||
'nasm_flags': [
|
||||
'-fwin64',
|
||||
@@ -155,30 +128,6 @@
|
||||
},
|
||||
],
|
||||
}],
|
||||
['OS in {"ios","mac"}', {
|
||||
'conditions': [
|
||||
['asm_target_arch=="x86"', {
|
||||
'sources': [
|
||||
'<@(boringssl_apple_x86_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch in {"x86-64", "x64"}', {
|
||||
'sources': [
|
||||
'<@(boringssl_apple_x86_64_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm"', {
|
||||
'sources': [
|
||||
'<@(boringssl_apple_arm_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm64"', {
|
||||
'sources': [
|
||||
'<@(boringssl_apple_aarch64_files)',
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user