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

Side by Side Diff: build/secondary/third_party/nss/BUILD.gn

Issue 1285133004: ios: Fixing base_unittests to build with gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_base.2
Patch Set: Created 5 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 | « base/test/BUILD.gn ('k') | 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/linux/pkg_config.gni") 5 import("//build/config/linux/pkg_config.gni")
6 6
7 if (is_linux) { 7 if (is_linux) {
8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL 8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
9 # library but the system NSS libraries. Non-Linux platforms using NSS use the 9 # library but the system NSS libraries. Non-Linux platforms using NSS use the
10 # hermetic one in //third_party/nss. 10 # hermetic one in //third_party/nss.
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 "nss/lib/libpkix/pkix_pl_nss/system", 1089 "nss/lib/libpkix/pkix_pl_nss/system",
1090 ] 1090 ]
1091 } else { 1091 } else {
1092 defines += [ "NSS_DISABLE_LIBPKIX" ] 1092 defines += [ "NSS_DISABLE_LIBPKIX" ]
1093 } 1093 }
1094 1094
1095 if (!include_nss_root_certs) { 1095 if (!include_nss_root_certs) {
1096 defines += [ "NSS_DISABLE_ROOT_CERTS" ] 1096 defines += [ "NSS_DISABLE_ROOT_CERTS" ]
1097 } 1097 }
1098 1098
1099 if (current_cpu == "x64" && !is_win) { 1099 if (current_cpu == "x64" && !is_win && !is_ios) {
1100 sources -= [ 1100 sources -= [
1101 "nss/lib/freebl/chacha20/chacha20.c", 1101 "nss/lib/freebl/chacha20/chacha20.c",
1102 "nss/lib/freebl/poly1305/poly1305.c", 1102 "nss/lib/freebl/poly1305/poly1305.c",
1103 ] 1103 ]
1104 } else { 1104 } else {
1105 sources -= [ 1105 sources -= [
1106 "nss/lib/freebl/chacha20/chacha20_vec.c", 1106 "nss/lib/freebl/chacha20/chacha20_vec.c",
1107 "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c", 1107 "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
1108 ] 1108 ]
1109 } 1109 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 "MP_IS_LITTLE_ENDIAN", 1170 "MP_IS_LITTLE_ENDIAN",
1171 "WIN64", 1171 "WIN64",
1172 ] 1172 ]
1173 } 1173 }
1174 } else { 1174 } else {
1175 # Not Windows. 1175 # Not Windows.
1176 sources -= [ 1176 sources -= [
1177 # mpi_x86_asm.c contains MSVC inline assembly code. 1177 # mpi_x86_asm.c contains MSVC inline assembly code.
1178 "nss/lib/freebl/mpi/mpi_x86_asm.c", 1178 "nss/lib/freebl/mpi/mpi_x86_asm.c",
1179 ] 1179 ]
1180 if (is_ios) {
1181 sources -= [ "nss/lib/freebl/intel-aes-x86-masm.asm" ]
Nico 2015/08/18 15:15:43 Shouldn't .asm files be ignored automatically on n
sherouk 2015/08/18 16:06:23 No, they are not filtered. This target is only def
Nico 2015/08/18 17:47:05 There's a main waterfall bot doing GN bots on OS X
sherouk 2015/08/19 13:14:32 I was not aware of that bot, Thanks! This bot does
Nico 2015/08/19 15:28:05 Ah, iOS is the only platform we still build NSS on
sherouk 2015/08/19 16:50:08 Done, Thank you!
1182 }
1180 } 1183 }
1181 1184
1182 if (is_clang) { 1185 if (is_clang) {
1183 cflags += [ 1186 cflags += [
1184 # nss doesn"t explicitly cast between different enum types. 1187 # nss doesn"t explicitly cast between different enum types.
1185 "-Wno-conversion", 1188 "-Wno-conversion",
1186 1189
1187 # nss prefers `a && b || c` over `(a && b) || c`. 1190 # nss prefers `a && b || c` over `(a && b) || c`.
1188 "-Wno-logical-op-parentheses", 1191 "-Wno-logical-op-parentheses",
1189 1192
(...skipping 11 matching lines...) Expand all
1201 deps = [ 1204 deps = [
1202 ":nspr", 1205 ":nspr",
1203 "//third_party/sqlite", 1206 "//third_party/sqlite",
1204 ] 1207 ]
1205 1208
1206 if (is_win && current_cpu == "x86") { 1209 if (is_win && current_cpu == "x86") {
1207 deps += [ ":nss_static_avx" ] 1210 deps += [ ":nss_static_avx" ]
1208 } 1211 }
1209 } 1212 }
1210 } # Windows/Mac/iOS. 1213 } # Windows/Mac/iOS.
OLDNEW
« no previous file with comments | « base/test/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698