Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / third_party / nss / ssl / BUILD.gn

diff --git a/src/net/third_party/nss/ssl/BUILD.gn b/src/net/third_party/nss/ssl/BUILD.gn
index 67c5851..b8fe40f 100644 (file)
--- a/src/net/third_party/nss/ssl/BUILD.gn
+++ b/src/net/third_party/nss/ssl/BUILD.gn
@@ -8,6 +8,14 @@ config("ssl_config") {
   if (is_mac || is_win) {
     defines = [ "NSS_PLATFORM_CLIENT_AUTH" ]
   }
+
+  if (is_clang) {
+    cflags = [
+      # There is a broken header guard in /usr/include/nss/secmod.h:
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
+      "-Wno-header-guard",
+    ]
+  }
 }
 
 component("libssl") {
@@ -76,7 +84,9 @@ component("libssl") {
       "unix_err.c",
       "unix_err.h",
     ]
-    sources += [ "exports_win.def" ]
+    if (component_mode == "shared_library") {
+      ldflags = [ "/DEF:" + rebase_path("exports_win.def", root_build_dir) ]
+    }
   } else if (is_linux) {
     if (component_mode == "shared_library") {
       configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
@@ -120,18 +130,6 @@ component("libssl") {
     ]
   }
 
-  if (is_clang) {
-    cflags += [
-      # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
-      # system's cert.h because cert.h isn't in chromium's repo.
-      "-Wno-incompatible-pointer-types",
-
-      # There is a broken header guard in /usr/include/nss/secmod.h:
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
-      "-Wno-header-guard",
-    ]
-  }
-
   if (is_debug) {
     defines += [ "DEBUG" ]
   }