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

Unified Diff: third_party/boringssl/boringssl.gyp

Issue 1126663002: Use Mac assembly for x86 iOS simulator targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a bit Created 5 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
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boringssl/boringssl.gyp
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp
index b20d0d4ef5e9da8477fc0780444335eef7ae1680..f3a169d508a597f5f3a8cfff1d300905da63c02b 100644
--- a/third_party/boringssl/boringssl.gyp
+++ b/third_party/boringssl/boringssl.gyp
@@ -46,7 +46,7 @@
}],
['target_arch == "ia32"', {
'conditions': [
- ['OS == "mac"', {
+ ['OS == "mac" or OS == "ios"', {
'sources': [ '<@(boringssl_mac_x86_sources)' ],
}],
['OS == "linux" or OS == "android"', {
@@ -63,14 +63,14 @@
'../yasm/yasm_compile.gypi',
],
}],
- ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
+ ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
]
}],
['target_arch == "x64"', {
'conditions': [
- ['OS == "mac"', {
+ ['OS == "mac" or OS == "ios"', {
'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
}],
['OS == "linux" or OS == "android"', {
@@ -87,7 +87,7 @@
'../yasm/yasm_compile.gypi',
],
}],
- ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
+ ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
]
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698