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

Unified Diff: third_party/boringssl/update_gypi_and_asm.py

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
Index: third_party/boringssl/update_gypi_and_asm.py
diff --git a/third_party/boringssl/update_gypi_and_asm.py b/third_party/boringssl/update_gypi_and_asm.py
index 41196a51392fbb2297ebd278cb735b7885f66909..751b2dbaf636b3a50420e2ee396ba45e6c67d570 100644
--- a/third_party/boringssl/update_gypi_and_asm.py
+++ b/third_party/boringssl/update_gypi_and_asm.py
@@ -19,7 +19,7 @@ OS_ARCH_COMBOS = [
('mac', 'x86', 'macosx', ['-fPIC'], 'S'),
('mac', 'x86_64', 'macosx', [''], 'S'),
('win', 'x86', 'win32n', [''], 'asm'),
- ('win', 'x86_64', 'masm', [''], 'asm'),
+ ('win', 'x86_64', 'nasm', [''], 'asm'),
]
# NON_PERL_FILES enumerates assembly files that are not processed by the
@@ -220,6 +220,9 @@ def main():
'sources': [
'%s',
],
+ # TODO(davidben): Fix size_t truncations in BoringSSL.
+ # https://crbug.com/429039
+ 'msvs_disabled_warnings': [ 4267, ],
},\n""" % (test_name, test))
test_names.append(test_name)
« no previous file with comments | « third_party/boringssl/boringssl_unittest.cc ('k') | third_party/boringssl/win-x86_64/crypto/aes/aes-x86_64.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698