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

Side by Side Diff: nss.gyp

Issue 482353002: nss.gyp: Remove two files from sources that were removed in all conditionals. (Closed) Base URL: http://src.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 4 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 | nss/lib/freebl/intel-aes-x64-masm.asm » ('j') | 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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="ios"', { 8 ['OS=="ios"', {
9 'exclude_nss_root_certs%': 0, 9 'exclude_nss_root_certs%': 0,
10 'exclude_nss_libpkix%': 0, 10 'exclude_nss_libpkix%': 0,
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 'nss/lib/freebl/ecl/ecp_256_32.c', 575 'nss/lib/freebl/ecl/ecp_256_32.c',
576 'nss/lib/freebl/ecl/ecp_384.c', 576 'nss/lib/freebl/ecl/ecp_384.c',
577 'nss/lib/freebl/ecl/ecp_521.c', 577 'nss/lib/freebl/ecl/ecp_521.c',
578 'nss/lib/freebl/ecl/ecp_aff.c', 578 'nss/lib/freebl/ecl/ecp_aff.c',
579 'nss/lib/freebl/ecl/ecp_jac.c', 579 'nss/lib/freebl/ecl/ecp_jac.c',
580 'nss/lib/freebl/ecl/ecp_jm.c', 580 'nss/lib/freebl/ecl/ecp_jm.c',
581 'nss/lib/freebl/ecl/ecp_mont.c', 581 'nss/lib/freebl/ecl/ecp_mont.c',
582 'nss/lib/freebl/ecl/ec_naf.c', 582 'nss/lib/freebl/ecl/ec_naf.c',
583 'nss/lib/freebl/gcm.c', 583 'nss/lib/freebl/gcm.c',
584 'nss/lib/freebl/gcm.h', 584 'nss/lib/freebl/gcm.h',
585 'nss/lib/freebl/intel-aes-x64-masm.asm',
586 'nss/lib/freebl/intel-aes-x86-masm.asm', 585 'nss/lib/freebl/intel-aes-x86-masm.asm',
587 'nss/lib/freebl/intel-aes.h', 586 'nss/lib/freebl/intel-aes.h',
588 'nss/lib/freebl/intel-gcm-wrap.c', 587 'nss/lib/freebl/intel-gcm-wrap.c',
589 'nss/lib/freebl/intel-gcm-x64-masm.asm',
590 'nss/lib/freebl/intel-gcm-x86-masm.asm', 588 'nss/lib/freebl/intel-gcm-x86-masm.asm',
591 'nss/lib/freebl/intel-gcm.h', 589 'nss/lib/freebl/intel-gcm.h',
592 'nss/lib/freebl/hmacct.c', 590 'nss/lib/freebl/hmacct.c',
593 'nss/lib/freebl/hmacct.h', 591 'nss/lib/freebl/hmacct.h',
594 'nss/lib/freebl/jpake.c', 592 'nss/lib/freebl/jpake.c',
595 'nss/lib/freebl/md2.c', 593 'nss/lib/freebl/md2.c',
596 'nss/lib/freebl/md5.c', 594 'nss/lib/freebl/md5.c',
597 'nss/lib/freebl/mpi/logtab.h', 595 'nss/lib/freebl/mpi/logtab.h',
598 'nss/lib/freebl/mpi/mpcpucache.c', 596 'nss/lib/freebl/mpi/mpcpucache.c',
599 'nss/lib/freebl/mpi/mpi-config.h', 597 'nss/lib/freebl/mpi/mpi-config.h',
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c', 1101 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c',
1104 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.h', 1102 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.h',
1105 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapresponse.c', 1103 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapresponse.c',
1106 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapresponse.h', 1104 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapresponse.h',
1107 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapt.h', 1105 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapt.h',
1108 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaptemplates.c', 1106 'nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaptemplates.c',
1109 ], 1107 ],
1110 }], 1108 }],
1111 ['target_arch=="ia32"', { 1109 ['target_arch=="ia32"', {
1112 'sources!': [ 1110 'sources!': [
1113 'nss/lib/freebl/intel-aes-x64-masm.asm',
1114 'nss/lib/freebl/intel-gcm-x64-masm.asm',
1115 'nss/lib/freebl/mpi/mpi_amd64.c', 1111 'nss/lib/freebl/mpi/mpi_amd64.c',
1116 ], 1112 ],
1117 }], 1113 }],
1118 ['target_arch=="x64" and OS!="win"', { 1114 ['target_arch=="x64" and OS!="win"', {
1119 'sources!': [ 1115 'sources!': [
1120 'nss/lib/freebl/chacha20/chacha20.c', 1116 'nss/lib/freebl/chacha20/chacha20.c',
1121 'nss/lib/freebl/poly1305/poly1305.c', 1117 'nss/lib/freebl/poly1305/poly1305.c',
1122 ], 1118 ],
1123 }, { # else: target_arch!="x64" or OS=="win" 1119 }, { # else: target_arch!="x64" or OS=="win"
1124 'sources!': [ 1120 'sources!': [
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 'defines': [ 1194 'defines': [
1199 'NSS_USE_64', 1195 'NSS_USE_64',
1200 'NSS_X86_OR_X64', 1196 'NSS_X86_OR_X64',
1201 'NSS_X64', 1197 'NSS_X64',
1202 '_AMD64_', 1198 '_AMD64_',
1203 'MP_CHAR_STORE_SLOW', 1199 'MP_CHAR_STORE_SLOW',
1204 'MP_IS_LITTLE_ENDIAN', 1200 'MP_IS_LITTLE_ENDIAN',
1205 'WIN64', 1201 'WIN64',
1206 ], 1202 ],
1207 'sources!': [ 1203 'sources!': [
1208 'nss/lib/freebl/intel-aes-x64-masm.asm',
1209 'nss/lib/freebl/intel-aes-x86-masm.asm', 1204 'nss/lib/freebl/intel-aes-x86-masm.asm',
1210 'nss/lib/freebl/intel-gcm-wrap.c', 1205 'nss/lib/freebl/intel-gcm-wrap.c',
1211 'nss/lib/freebl/intel-gcm-x64-masm.asm',
1212 'nss/lib/freebl/intel-gcm-x86-masm.asm', 1206 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1213 'nss/lib/freebl/mpi/mpi_amd64.c', 1207 'nss/lib/freebl/mpi/mpi_amd64.c',
1214 'nss/lib/freebl/mpi/mpi_x86_asm.c', 1208 'nss/lib/freebl/mpi/mpi_x86_asm.c',
1215 ], 1209 ],
1216 }], 1210 }],
1217 ], 1211 ],
1218 }, { # else: OS!="win" 1212 }, { # else: OS!="win"
1219 'sources!': [ 1213 'sources!': [
1220 'nss/lib/freebl/intel-aes-x64-masm.asm',
1221 'nss/lib/freebl/intel-aes-x86-masm.asm', 1214 'nss/lib/freebl/intel-aes-x86-masm.asm',
1222 'nss/lib/freebl/intel-gcm-wrap.c', 1215 'nss/lib/freebl/intel-gcm-wrap.c',
1223 'nss/lib/freebl/intel-gcm-x64-masm.asm',
1224 'nss/lib/freebl/intel-gcm-x86-masm.asm', 1216 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1225 # mpi_x86_asm.c contains MSVC inline assembly code. 1217 # mpi_x86_asm.c contains MSVC inline assembly code.
1226 'nss/lib/freebl/mpi/mpi_x86_asm.c', 1218 'nss/lib/freebl/mpi/mpi_x86_asm.c',
1227 ], 1219 ],
1228 }], 1220 }],
1229 ], 1221 ],
1230 }, 1222 },
1231 ], 1223 ],
1232 } 1224 }
OLDNEW
« no previous file with comments | « no previous file | nss/lib/freebl/intel-aes-x64-masm.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698