OLD | NEW |
---|---|
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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 'mozilla/security/nss/lib/dev/devtoken.c', | 530 'mozilla/security/nss/lib/dev/devtoken.c', |
531 'mozilla/security/nss/lib/dev/devutil.c', | 531 'mozilla/security/nss/lib/dev/devutil.c', |
532 'mozilla/security/nss/lib/dev/nssdev.h', | 532 'mozilla/security/nss/lib/dev/nssdev.h', |
533 'mozilla/security/nss/lib/dev/nssdevt.h', | 533 'mozilla/security/nss/lib/dev/nssdevt.h', |
534 'mozilla/security/nss/lib/freebl/aeskeywrap.c', | 534 'mozilla/security/nss/lib/freebl/aeskeywrap.c', |
535 'mozilla/security/nss/lib/freebl/alg2268.c', | 535 'mozilla/security/nss/lib/freebl/alg2268.c', |
536 'mozilla/security/nss/lib/freebl/alghmac.c', | 536 'mozilla/security/nss/lib/freebl/alghmac.c', |
537 'mozilla/security/nss/lib/freebl/alghmac.h', | 537 'mozilla/security/nss/lib/freebl/alghmac.h', |
538 'mozilla/security/nss/lib/freebl/arcfive.c', | 538 'mozilla/security/nss/lib/freebl/arcfive.c', |
539 'mozilla/security/nss/lib/freebl/arcfour.c', | 539 'mozilla/security/nss/lib/freebl/arcfour.c', |
540 'mozilla/security/nss/lib/freebl/arcfour-amd64-masm.asm', | |
540 'mozilla/security/nss/lib/freebl/blapi.h', | 541 'mozilla/security/nss/lib/freebl/blapi.h', |
541 'mozilla/security/nss/lib/freebl/blapii.h', | 542 'mozilla/security/nss/lib/freebl/blapii.h', |
542 'mozilla/security/nss/lib/freebl/blapit.h', | 543 'mozilla/security/nss/lib/freebl/blapit.h', |
543 'mozilla/security/nss/lib/freebl/camellia.c', | 544 'mozilla/security/nss/lib/freebl/camellia.c', |
544 'mozilla/security/nss/lib/freebl/camellia.h', | 545 'mozilla/security/nss/lib/freebl/camellia.h', |
545 'mozilla/security/nss/lib/freebl/ctr.c', | 546 'mozilla/security/nss/lib/freebl/ctr.c', |
546 'mozilla/security/nss/lib/freebl/ctr.h', | 547 'mozilla/security/nss/lib/freebl/ctr.h', |
547 'mozilla/security/nss/lib/freebl/cts.c', | 548 'mozilla/security/nss/lib/freebl/cts.c', |
548 'mozilla/security/nss/lib/freebl/cts.h', | 549 'mozilla/security/nss/lib/freebl/cts.h', |
549 'mozilla/security/nss/lib/freebl/des.c', | 550 'mozilla/security/nss/lib/freebl/des.c', |
(...skipping 24 matching lines...) Expand all Loading... | |
574 'mozilla/security/nss/lib/freebl/jpake.c', | 575 'mozilla/security/nss/lib/freebl/jpake.c', |
575 'mozilla/security/nss/lib/freebl/md2.c', | 576 'mozilla/security/nss/lib/freebl/md2.c', |
576 'mozilla/security/nss/lib/freebl/md5.c', | 577 'mozilla/security/nss/lib/freebl/md5.c', |
577 'mozilla/security/nss/lib/freebl/mpi/logtab.h', | 578 'mozilla/security/nss/lib/freebl/mpi/logtab.h', |
578 'mozilla/security/nss/lib/freebl/mpi/mpcpucache.c', | 579 'mozilla/security/nss/lib/freebl/mpi/mpcpucache.c', |
579 'mozilla/security/nss/lib/freebl/mpi/mpi-config.h', | 580 'mozilla/security/nss/lib/freebl/mpi/mpi-config.h', |
580 'mozilla/security/nss/lib/freebl/mpi/mpi-priv.h', | 581 'mozilla/security/nss/lib/freebl/mpi/mpi-priv.h', |
581 'mozilla/security/nss/lib/freebl/mpi/mpi.c', | 582 'mozilla/security/nss/lib/freebl/mpi/mpi.c', |
582 'mozilla/security/nss/lib/freebl/mpi/mpi.h', | 583 'mozilla/security/nss/lib/freebl/mpi/mpi.h', |
583 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', | 584 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', |
585 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64_masm.asm', | |
584 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', | 586 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', |
585 'mozilla/security/nss/lib/freebl/mpi/mplogic.c', | 587 'mozilla/security/nss/lib/freebl/mpi/mplogic.c', |
586 'mozilla/security/nss/lib/freebl/mpi/mplogic.h', | 588 'mozilla/security/nss/lib/freebl/mpi/mplogic.h', |
587 'mozilla/security/nss/lib/freebl/mpi/mpmontg.c', | 589 'mozilla/security/nss/lib/freebl/mpi/mpmontg.c', |
588 'mozilla/security/nss/lib/freebl/mpi/mpprime.c', | 590 'mozilla/security/nss/lib/freebl/mpi/mpprime.c', |
589 'mozilla/security/nss/lib/freebl/mpi/mpprime.h', | 591 'mozilla/security/nss/lib/freebl/mpi/mpprime.h', |
592 'mozilla/security/nss/lib/freebl/mpi/mp_comba_amd64_masm.asm', | |
590 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m-priv.h', | 593 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m-priv.h', |
591 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c', | 594 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c', |
592 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.h', | 595 'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.h', |
593 'mozilla/security/nss/lib/freebl/mpi/primes.c', | 596 'mozilla/security/nss/lib/freebl/mpi/primes.c', |
594 'mozilla/security/nss/lib/freebl/pqg.c', | 597 'mozilla/security/nss/lib/freebl/pqg.c', |
595 'mozilla/security/nss/lib/freebl/pqg.h', | 598 'mozilla/security/nss/lib/freebl/pqg.h', |
596 'mozilla/security/nss/lib/freebl/rawhash.c', | 599 'mozilla/security/nss/lib/freebl/rawhash.c', |
597 'mozilla/security/nss/lib/freebl/rijndael.c', | 600 'mozilla/security/nss/lib/freebl/rijndael.c', |
598 'mozilla/security/nss/lib/freebl/rijndael.h', | 601 'mozilla/security/nss/lib/freebl/rijndael.h', |
599 'mozilla/security/nss/lib/freebl/rijndael32.tab', | 602 'mozilla/security/nss/lib/freebl/rijndael32.tab', |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1047 ['exclude', '^mozilla/security/nss/lib/libpkix/'], | 1050 ['exclude', '^mozilla/security/nss/lib/libpkix/'], |
1048 ], | 1051 ], |
1049 'sources!': [ | 1052 'sources!': [ |
1050 'mozilla/security/nss/lib/certhigh/certvfypkix.c', | 1053 'mozilla/security/nss/lib/certhigh/certvfypkix.c', |
1051 'mozilla/security/nss/lib/certhigh/certvfypkixprint.c', | 1054 'mozilla/security/nss/lib/certhigh/certvfypkixprint.c', |
1052 ], | 1055 ], |
1053 'include_dirs/': [ | 1056 'include_dirs/': [ |
1054 ['exclude', '^mozilla/security/nss/lib/libpkix/'], | 1057 ['exclude', '^mozilla/security/nss/lib/libpkix/'], |
1055 ], | 1058 ], |
1056 }], | 1059 }], |
1057 ['target_arch=="ia32"', { | |
1058 'sources/': [ | |
1059 ['exclude', 'amd64'], | |
1060 ], | |
1061 }], | |
1062 ['OS=="mac" or OS=="ios"', { | 1060 ['OS=="mac" or OS=="ios"', { |
1063 'defines': [ | 1061 'defines': [ |
1064 'XP_UNIX', | 1062 'XP_UNIX', |
1065 'DARWIN', | 1063 'DARWIN', |
1066 'HAVE_STRERROR', | 1064 'HAVE_STRERROR', |
1067 'HAVE_BSD_FLOCK', | 1065 'HAVE_BSD_FLOCK', |
1068 'SHLIB_SUFFIX=\"dylib\"', | 1066 'SHLIB_SUFFIX=\"dylib\"', |
1069 'SHLIB_PREFIX=\"lib\"', | 1067 'SHLIB_PREFIX=\"lib\"', |
1070 'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"', | 1068 'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"', |
1071 ], | 1069 ], |
1072 'sources!': [ | |
1073 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', | |
1074 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', | |
1075 ], | |
1076 'xcode_settings': { | 1070 'xcode_settings': { |
1077 'conditions': [ | 1071 'conditions': [ |
1078 ['component == "shared_library"', { | 1072 ['component == "shared_library"', { |
1079 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden | 1073 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden |
1080 }], | 1074 }], |
1081 ], | 1075 ], |
1082 # Can't use 'target_arch=="ia32"' conditional because that is | 1076 # Can't use 'target_arch=="ia32"' conditional because that is |
1083 # only checked at GYP file generation time. | 1077 # only checked at GYP file generation time. |
1084 'GCC_PREPROCESSOR_DEFINITIONS[arch=i386]': [ | 1078 'GCC_PREPROCESSOR_DEFINITIONS[arch=i386]': [ |
1085 '$(inherited)', | 1079 '$(inherited)', |
(...skipping 29 matching lines...) Expand all Loading... | |
1115 'defines': [ | 1109 'defines': [ |
1116 'NSS_X86_OR_X64', | 1110 'NSS_X86_OR_X64', |
1117 'NSS_X86', | 1111 'NSS_X86', |
1118 '_X86_', | 1112 '_X86_', |
1119 'MP_ASSEMBLY_MULTIPLY', | 1113 'MP_ASSEMBLY_MULTIPLY', |
1120 'MP_ASSEMBLY_SQUARE', | 1114 'MP_ASSEMBLY_SQUARE', |
1121 'MP_ASSEMBLY_DIV_2DX1D', | 1115 'MP_ASSEMBLY_DIV_2DX1D', |
1122 'MP_USE_UINT_DIGIT', | 1116 'MP_USE_UINT_DIGIT', |
1123 'MP_NO_MP_WORD', | 1117 'MP_NO_MP_WORD', |
1124 ], | 1118 ], |
1119 }, { | |
1120 'sources!': [ | |
1121 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', | |
1122 ], | |
1125 }], | 1123 }], |
1124 ['target_arch=="x64"', { | |
1125 'defines': [ | |
1126 'NSS_X86_OR_X64', | |
1127 'NSS_USE_64', | |
1128 'NSS_X64', | |
1129 'WIN64', | |
wtc
2013/01/04 16:26:40
coreconf/WIN32.mk also defines _AMD64_. It may not
| |
1130 'MP_CHAR_STORE_SLOW', | |
1131 'MP_ASSEMBLY_MULTIPLY', | |
1132 'MP_IS_LITTLE_ENDIAN', | |
wtc
2013/01/04 16:26:40
Not sure if you meant to sort these macros alphabe
Ryan Sleevi
2013/01/07 03:37:34
To match the order
wtc
2013/01/10 03:21:09
These macros are defined in lib/freebl/Makefile in
| |
1133 'MPI_AMD64', | |
1134 'NSS_BEVAND_ARCFOUR', | |
1135 'NSS_USE_COMBA', | |
1136 ], | |
1137 'rules': [ | |
1138 { | |
1139 'rule_name': 'assemble', | |
1140 'extension': 'asm', | |
1141 'variables': { | |
1142 'output_file': '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)_asm.o bj' | |
wtc
2013/01/04 16:26:40
We should not need _asm before .obj. The NSS corec
Ryan Sleevi
2013/01/07 03:37:34
There is no need to match what NSS does here for t
wtc
2013/01/10 03:21:09
Names of assembly code files typically contain the
| |
1143 }, | |
1144 'outputs': [ | |
1145 '<(output_file)', | |
1146 ], | |
1147 'action': [ | |
1148 'ml64.exe', | |
1149 '/Fo', '<(output_file)', | |
1150 '/c', | |
1151 '/Ta', '<(RULE_INPUT_PATH)', | |
wtc
2013/01/04 16:26:40
The NSS coreconf build system passes some flags to
Ryan Sleevi
2013/01/07 03:37:34
Yes, it appears these flags are tied to legacy MAS
| |
1152 ], | |
1153 'process_outputs_as_sources': 1, | |
1154 }, | |
1155 ], | |
1156 }, { | |
1157 'sources!': [ | |
1158 'mozilla/security/nss/lib/freebl/arcfour-amd64-masm.asm', | |
1159 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', | |
1160 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64_masm.asm', | |
1161 'mozilla/security/nss/lib/freebl/mpi/mp_comba_amd64_masm.asm', | |
1162 ], | |
1163 }], | |
1164 ], | |
1165 }, { | |
wtc
2013/01/04 16:26:40
A comment here would be useful because this "else"
| |
1166 'sources!': [ | |
1167 'mozilla/security/nss/lib/freebl/arcfour-amd64-masm.asm', | |
1168 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', | |
1169 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', | |
1170 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64_masm.asm', | |
1171 'mozilla/security/nss/lib/freebl/mpi/mp_comba_amd64_masm.asm', | |
1126 ], | 1172 ], |
1127 }], | 1173 }], |
1128 ['clang==1', { | 1174 ['clang==1', { |
1129 'xcode_settings': { | 1175 'xcode_settings': { |
1130 'WARNING_CFLAGS': [ | 1176 'WARNING_CFLAGS': [ |
1131 # nss doesn't explicitly cast between different enum types. | 1177 # nss doesn't explicitly cast between different enum types. |
1132 '-Wno-conversion', | 1178 '-Wno-conversion', |
1133 # nss passes "const char*" through "void*". | 1179 # nss passes "const char*" through "void*". |
1134 '-Wno-incompatible-pointer-types', | 1180 '-Wno-incompatible-pointer-types', |
1135 # nss prefers `a && b || c` over `(a && b) || c`. | 1181 # nss prefers `a && b || c` over `(a && b) || c`. |
1136 '-Wno-logical-op-parentheses', | 1182 '-Wno-logical-op-parentheses', |
1137 # nss doesn't use exhaustive switches on enums | 1183 # nss doesn't use exhaustive switches on enums |
1138 '-Wno-switch', | 1184 '-Wno-switch', |
1139 # nss has some `unsigned < 0` checks. | 1185 # nss has some `unsigned < 0` checks. |
1140 '-Wno-tautological-compare', | 1186 '-Wno-tautological-compare', |
1141 ], | 1187 ], |
1142 }, | 1188 }, |
1143 'cflags': [ | 1189 'cflags': [ |
1144 '-Wno-conversion', | 1190 '-Wno-conversion', |
1145 '-Wno-incompatible-pointer-types', | 1191 '-Wno-incompatible-pointer-types', |
1146 '-Wno-logical-op-parentheses', | 1192 '-Wno-logical-op-parentheses', |
1147 '-Wno-switch', | 1193 '-Wno-switch', |
1148 '-Wno-tautological-compare', | 1194 '-Wno-tautological-compare', |
1149 ], | 1195 ], |
1150 }], | 1196 }], |
1151 ], | 1197 ], |
1152 }, | 1198 }, |
1153 ], | 1199 ], |
1154 } | 1200 } |
OLD | NEW |