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

Unified Diff: third_party/boringssl/BUILD.gn

Issue 1139263002: Build BoringSSL without assembly if using MSan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « DEPS ('k') | 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 cd398de62b8f4af43a457a6ae29a1c9018439815..8ce890d364bab9c9b785adbf5308bb72479844cf 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -25,7 +25,7 @@ gypi_values =
# Windows' assembly is built with Yasm. The other platforms use the platform
# assembler.
-if (is_win) {
+if (is_win && !is_msan) {
import("//third_party/yasm/yasm_assemble.gni")
yasm_assemble("boringssl_asm") {
if (current_cpu == "x64") {
@@ -70,7 +70,9 @@ component("boringssl") {
"src/crypto",
]
- if (current_cpu == "x64") {
+ if (is_msan) {
+ defines += [ "OPENSSL_NO_ASM" ]
+ } else if (current_cpu == "x64") {
if (is_mac || is_ios) {
sources += gypi_values.boringssl_mac_x86_64_sources
} else if (is_linux || is_android) {
« no previous file with comments | « DEPS ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698