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

Unified Diff: nss.gyp

Issue 1859253002: Fix ODR violation by excluding the correct paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss.gyp
diff --git a/nss.gyp b/nss.gyp
index 6a4ef6d2b45e7d3e3ce9a9c1494ea1d67642ede5..2bc7f441144ec8006f018adf5847fc0ba3831d97 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -941,13 +941,13 @@
'conditions': [
['target_arch=="x64" and OS!="win"', {
'sources!': [
- 'nss/lib/freebl/chacha20/chacha20.c',
- 'nss/lib/freebl/poly1305/poly1305.c',
+ 'nss/lib/freebl/chacha20.c',
+ 'nss/lib/freebl/poly1305.c',
],
}, { # else: target_arch!="x64" or OS=="win"
'sources!': [
- 'nss/lib/freebl/chacha20/chacha20_vec.c',
- 'nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c',
+ 'nss/lib/freebl/chacha20_vec.c',
+ 'nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c',
],
}],
['OS=="ios"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698