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

Unified Diff: third_party/boringssl/boringssl.gyp

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 | « third_party/boringssl/BUILD.gn ('k') | third_party/boringssl/boringssl.gypi » ('j') | 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 f18e333559570974a3549893157968cf973998e8..c3760c061b015cdc3f5077ef94d65615a50c7aed 100644
--- a/third_party/boringssl/boringssl.gyp
+++ b/third_party/boringssl/boringssl.gyp
@@ -34,7 +34,18 @@
['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_x86_sources)' ],
}],
- ['OS != "mac" and OS != "linux" and OS != "android"', {
+ ['OS == "win"', {
+ 'sources': [ '<@(boringssl_win_x86_sources)' ],
+ # Win32 is built with Yasm. The other ports use the platform
+ # assembler.
+ 'variables': {
+ 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/boringssl',
+ },
+ 'includes': [
+ '../yasm/yasm_compile.gypi',
+ ],
+ }],
+ ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
]
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | third_party/boringssl/boringssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698