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

Unified Diff: third_party/boringssl/BUILD.gn

Issue 1809153002: Removing iOS from testing in BoringSSL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gyp » ('j') | 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 9b9badaa78099f08779fc50bee12906e33e37062..8f6744bac3a7996919f428bc4482bad4a969a87b 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -82,7 +82,9 @@ if (is_win && !is_msan) {
if (is_msan) {
public_configs = [ ":no_asm_config" ]
} else if (current_cpu == "x64") {
- if (is_mac || is_ios) {
+ if (is_ios) {
+ defines += [ "OPENSSL_NO_ASM" ]
+ } else 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
@@ -90,7 +92,9 @@ if (is_win && !is_msan) {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "x86") {
- if (is_mac || is_ios) {
+ if (is_ios) {
+ defines += [ "OPENSSL_NO_ASM" ]
+ } else if (is_mac) {
sources += gypi_values.boringssl_mac_x86_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_sources
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698