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

Unified Diff: third_party/boringssl/BUILD.gn

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « testing/chromoting/chromoting_integration_tests.isolate ('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 5dffa6506149907c0473f8f82932d8571129776e..ccd842451dd4fc55002067eea93f5ad3527b460c 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -25,11 +25,16 @@ gypi_values = exec_script(
"scope",
[ "//third_party/boringssl/boringssl.gypi" ])
-# Win32's assembly is built by Yasm. The other ports use the platform assembler.
-if (cpu_arch == "x86" && is_win) {
+# Windows' assembly is built with Yasm. The other platforms use the platform
+# assembler.
+if (is_win) {
import("//third_party/yasm/yasm_assemble.gni")
yasm_assemble("boringssl_asm") {
- sources = gypi_values.boringssl_win_x86_sources
+ if (cpu_arch == "x64") {
+ sources = gypi_values.boringssl_win_x86_64_sources
+ } else if (cpu_arch == "x86") {
+ sources = gypi_values.boringssl_win_x86_sources
+ }
}
}
@@ -61,13 +66,19 @@ component("boringssl") {
"src/crypto",
]
+ if (is_win) {
+ # TODO(davidben): Fix size_t truncations in BoringSSL.
+ # https://crbug.com/429039
+ cflags += [ "/wd4267"]
+ }
+
if (cpu_arch == "x64") {
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
} else if (is_win) {
- sources += gypi_values.boringssl_win_x86_64_sources
+ deps += [ ":boringssl_asm" ]
} else {
defines += [ "OPENSSL_NO_ASM" ]
}
« no previous file with comments | « testing/chromoting/chromoting_integration_tests.isolate ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698