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

Unified Diff: third_party/boringssl/boringssl.gyp

Issue 385983006: net: pickup "586" asm files for x86. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: .. Created 6 years, 5 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 | « no previous file | 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 ba87066d8b9758315f71616e3c0d5d85c3f73382..19e3fcb69587710a741a35bdbfc09eb4791f55a7 100644
--- a/third_party/boringssl/boringssl.gyp
+++ b/third_party/boringssl/boringssl.gyp
@@ -28,7 +28,7 @@
['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_x86_sources)' ],
}],
- ['OS != "mac" and OS != "linux"', {
+ ['OS != "mac" and OS != "linux" and OS != "android"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
]
@@ -44,12 +44,12 @@
['OS == "win"', {
'sources': [ '<@(boringssl_win_x86_64_sources)' ],
}],
- ['OS != "mac" and OS != "linux" and OS != "win"', {
+ ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
]
}],
- ['target_arch != "arm" and target_arch != "x86" and target_arch != "x64"', {
+ ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
],
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698