diff options
| author | davidben <davidben@chromium.org> | 2015-05-04 17:58:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 00:59:33 +0000 |
| commit | ec5b7687d06564998e7f1b96465878a391edc723 (patch) | |
| tree | 4018c6e92fe2b80854dfd78bf7b34d89bf839360 /third_party | |
| parent | 0f045e96533304388b88da9c4af42039790d8942 (diff) | |
| download | chromium_src-ec5b7687d06564998e7f1b96465878a391edc723.zip chromium_src-ec5b7687d06564998e7f1b96465878a391edc723.tar.gz chromium_src-ec5b7687d06564998e7f1b96465878a391edc723.tar.bz2 | |
Use Mac assembly for x86 iOS simulator targets.
BUG=484142
Review URL: https://codereview.chromium.org/1126663002
Cr-Commit-Position: refs/heads/master@{#328242}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/boringssl/BUILD.gn | 4 | ||||
| -rw-r--r-- | third_party/boringssl/boringssl.gyp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index b25d8d5..cd398de 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -71,7 +71,7 @@ component("boringssl") { ] if (current_cpu == "x64") { - if (is_mac) { + if (is_mac || is_ios) { sources += gypi_values.boringssl_mac_x86_64_sources } else if (is_linux || is_android) { sources += gypi_values.boringssl_linux_x86_64_sources @@ -81,7 +81,7 @@ component("boringssl") { defines += [ "OPENSSL_NO_ASM" ] } } else if (current_cpu == "x86") { - if (is_mac) { + if (is_mac || is_ios) { sources += gypi_values.boringssl_mac_x86_sources } else if (is_linux || is_android) { sources += gypi_values.boringssl_linux_x86_sources diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp index b20d0d4..f3a169d 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' ], }], ] |