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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'configurations': { 7 'configurations': {
8 'Debug': { 8 'Debug': {
9 'defines': [ 9 'defines': [
10 'DEBUG', 10 'DEBUG',
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 # nss has some `unsigned < 0` checks. 934 # nss has some `unsigned < 0` checks.
935 '-Wno-tautological-compare', 935 '-Wno-tautological-compare',
936 # nss-urandom-abort.patch removed the only call to 936 # nss-urandom-abort.patch removed the only call to
937 # rng_systemFromNoise 937 # rng_systemFromNoise
938 '-Wno-unused-function', 938 '-Wno-unused-function',
939 ], 939 ],
940 }, 940 },
941 'conditions': [ 941 'conditions': [
942 ['target_arch=="x64" and OS!="win"', { 942 ['target_arch=="x64" and OS!="win"', {
943 'sources!': [ 943 'sources!': [
944 'nss/lib/freebl/chacha20/chacha20.c', 944 'nss/lib/freebl/chacha20.c',
945 'nss/lib/freebl/poly1305/poly1305.c', 945 'nss/lib/freebl/poly1305.c',
946 ], 946 ],
947 }, { # else: target_arch!="x64" or OS=="win" 947 }, { # else: target_arch!="x64" or OS=="win"
948 'sources!': [ 948 'sources!': [
949 'nss/lib/freebl/chacha20/chacha20_vec.c', 949 'nss/lib/freebl/chacha20_vec.c',
950 'nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-sou rce.c', 950 'nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c',
951 ], 951 ],
952 }], 952 }],
953 ['OS=="ios"', { 953 ['OS=="ios"', {
954 'defines': [ 954 'defines': [
955 'XP_UNIX', 955 'XP_UNIX',
956 'DARWIN', 956 'DARWIN',
957 'HAVE_STRERROR', 957 'HAVE_STRERROR',
958 'HAVE_BSD_FLOCK', 958 'HAVE_BSD_FLOCK',
959 'SHLIB_SUFFIX=\"dylib\"', 959 'SHLIB_SUFFIX=\"dylib\"',
960 'SHLIB_PREFIX=\"lib\"', 960 'SHLIB_PREFIX=\"lib\"',
(...skipping 14 matching lines...) Expand all
975 '-include', '<(forced_include_file)', 975 '-include', '<(forced_include_file)',
976 ], 976 ],
977 }, 977 },
978 }], 978 }],
979 ], 979 ],
980 }, 980 },
981 ], 981 ],
982 }], 982 }],
983 ], 983 ],
984 } 984 }
OLDNEW
« 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