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

Unified Diff: build/secondary/third_party/nss/BUILD.gn

Issue 1275583002: Pull ICU, rename component build GN variables. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | net/third_party/nss/ssl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5484c675bf5d2d6746c63cf2e18cef7ea800f9d0..c2648f44ea2d4356430adcd887590e81e42aecd1 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -31,7 +31,7 @@ if (is_linux) {
"nspr/lib/libc/include",
]
- if (component_mode != "shared_library") {
+ if (!is_component_build) {
defines += [ "NSPR_STATIC" ]
}
}
@@ -355,7 +355,7 @@ if (is_linux) {
public_deps += [ ":nssckbi" ]
}
- if (component_mode == "shared_library") {
+ if (is_component_build) {
if (is_mac) {
ldflags = [ "-all_load" ]
} else if (is_win) {
« no previous file with comments | « build/config/android/config.gni ('k') | net/third_party/nss/ssl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698