Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1171)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/boringssl/BUILD.gn

Issue 1871043003: Fixing BoringSSL on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding simulator fix. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/cert/cert_verify_proc_ios.cc ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boringssl/BUILD.gn
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index 4016f550cbe96db208264704a41e1b45386e2840..7dfba58184654cea912a5a09f5ac910b2eaa63cc 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -82,9 +82,7 @@ if (is_win && !is_msan) {
if (is_msan) {
public_configs = [ ":no_asm_config" ]
} else if (current_cpu == "x64") {
- if (is_ios) {
- defines += [ "OPENSSL_NO_ASM" ]
- } else if (is_mac) {
+ if (is_mac) {
sources += gypi_values.boringssl_mac_x86_64_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_64_sources
@@ -92,9 +90,7 @@ if (is_win && !is_msan) {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "x86") {
- if (is_ios) {
- defines += [ "OPENSSL_NO_ASM" ]
- } else if (is_mac) {
+ if (is_mac) {
sources += gypi_values.boringssl_mac_x86_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_sources
« net/cert/cert_verify_proc_ios.cc ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698