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

Unified Diff: third_party/boringssl/BUILD.gn

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « testing/scripts/telemetry_unittests.py ('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 cc3701de0eced97731942682759f18096b120a9b..5dffa6506149907c0473f8f82932d8571129776e 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -25,6 +25,14 @@ 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) {
+ import("//third_party/yasm/yasm_assemble.gni")
+ yasm_assemble("boringssl_asm") {
+ sources = gypi_values.boringssl_win_x86_sources
+ }
+}
+
component("boringssl") {
sources = gypi_values.boringssl_lib_sources
@@ -68,6 +76,8 @@ component("boringssl") {
sources += gypi_values.boringssl_mac_x86_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_sources
+ } else if (is_win) {
+ deps += [ ":boringssl_asm" ]
} else {
defines += [ "OPENSSL_NO_ASM" ]
}
« no previous file with comments | « testing/scripts/telemetry_unittests.py ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698