build/secondary/third_party/nss/BUILD.gn - Issue 1285133004: ios: Fixing base_unittests to build with gn.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: build/secondary/third_party/nss/BUILD.gn

diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn

index e51fb21ac62595f27d9ade6b265e06bafeb32619..2cfea8a2f46f764981cbfa05e1a01ababd5be131 100644

--- a/build/secondary/third_party/nss/BUILD.gn

+++ b/build/secondary/third_party/nss/BUILD.gn

@@ -1096,7 +1096,7 @@ if (is_linux) {

defines += [ "NSS_DISABLE_ROOT_CERTS" ]

}

- if (current_cpu == "x64" && !is_win) {

+ if (current_cpu == "x64" && !is_win && !is_ios) {

sources -= [

"nss/lib/freebl/chacha20/chacha20.c",

"nss/lib/freebl/poly1305/poly1305.c",

@@ -1177,6 +1177,7 @@ if (is_linux) {

# mpi_x86_asm.c contains MSVC inline assembly code.

"nss/lib/freebl/mpi/mpi_x86_asm.c",

]

+ sources -= [ "nss/lib/freebl/intel-aes-x86-masm.asm" ]

Nico 2015/08/19 16:55:13 nit: merge this with the sources -= line on the pr

}

if (is_clang) {

« no previous file with comments | « base/test/BUILD.gn ('k') | no next file » | no next file with comments »