Commit de446058 authored by tkchin's avatar tkchin Committed by Commit bot

Compile BoringSSL for arm64 iOS

BUG=338886

Review URL: https://codereview.chromium.org/1064693002

Cr-Commit-Position: refs/heads/master@{#324132}
parent 01d8f26f
...@@ -90,9 +90,9 @@ component("boringssl") { ...@@ -90,9 +90,9 @@ component("boringssl") {
} else { } else {
defines += [ "OPENSSL_NO_ASM" ] defines += [ "OPENSSL_NO_ASM" ]
} }
} else if (current_cpu == "arm") { } else if (current_cpu == "arm" && (is_linux || is_android)) {
sources += gypi_values.boringssl_linux_arm_sources sources += gypi_values.boringssl_linux_arm_sources
} else if (current_cpu == "arm64") { } else if (current_cpu == "arm64" && (is_linux || is_android)) {
sources += gypi_values.boringssl_linux_aarch64_sources sources += gypi_values.boringssl_linux_aarch64_sources
} else { } else {
defines += [ "OPENSSL_NO_ASM" ] defines += [ "OPENSSL_NO_ASM" ]
......
...@@ -27,10 +27,22 @@ ...@@ -27,10 +27,22 @@
], ],
}], }],
['target_arch == "arm"', { ['target_arch == "arm"', {
'sources': [ '<@(boringssl_linux_arm_sources)' ], 'conditions': [
['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_arm_sources)' ],
}, {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
],
}], }],
['target_arch == "arm64"', { ['target_arch == "arm64"', {
'sources': [ '<@(boringssl_linux_aarch64_sources)' ], 'conditions': [
['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_aarch64_sources)' ],
}, {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
],
}], }],
['target_arch == "ia32"', { ['target_arch == "ia32"', {
'conditions': [ 'conditions': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment