Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / build / secondary / third_party / nss / BUILD.gn

diff --git a/src/build/secondary/third_party/nss/BUILD.gn b/src/build/secondary/third_party/nss/BUILD.gn
index 7c05da7..31ed5a9 100644 (file)
--- a/src/build/secondary/third_party/nss/BUILD.gn
+++ b/src/build/secondary/third_party/nss/BUILD.gn
@@ -205,7 +205,7 @@ if (is_linux) {
       "nspr/pr/src/threads/prtpd.c",
     ]
 
-    direct_dependent_configs = [ ":nspr_config" ]
+    public_configs = [ ":nspr_config" ]
 
     configs -= [
       "//build/config/compiler:chromium_code",
@@ -348,10 +348,10 @@ if (is_linux) {
       "nss/lib/nss/nssver.c",
     ]
 
-    deps = [ ":nss_static" ]
+    public_deps = [ ":nss_static" ]
 
     if (include_nss_root_certs) {
-      deps += [ ":nssckbi" ]
+      public_deps += [ ":nssckbi" ]
     }
 
     if (component_mode == "shared_library") {
@@ -362,8 +362,6 @@ if (is_linux) {
         ldflags = [ rebase_path("nss/exports_win.def", root_build_dir) ]
       }
     }
-
-    forward_dependent_configs_from = deps
   }
 
   config("nssckbi_config") {
@@ -385,7 +383,7 @@ if (is_linux) {
   # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency
   # without requiring nssckbi to be built as a shared library.
   source_set("nssckbi") {
-    visibility = ":nss"  # This target is internal implementation detail.
+    visibility = [ ":nss" ]  # This target is internal implementation detail.
 
     sources = [
       "nss/lib/ckfw/builtins/anchor.c",
@@ -441,12 +439,11 @@ if (is_linux) {
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
     include_dirs = [ "nss/lib/ckfw" ]
-    direct_dependent_configs = [ ":nssckbi_config" ]
+    public_configs = [ ":nssckbi_config" ]
 
-    deps = [
+    public_deps = [
       ":nss_static",
     ]
-    forward_dependent_configs_from = deps
   }
 
   config("nss_static_config") {
@@ -561,7 +558,6 @@ if (is_linux) {
       "nss/lib/freebl/blapi.h",
       "nss/lib/freebl/blapii.h",
       "nss/lib/freebl/blapit.h",
-      "nss/lib/freebl/build_config_mac.h",
       "nss/lib/freebl/camellia.c",
       "nss/lib/freebl/camellia.h",
       "nss/lib/freebl/chacha20/chacha20.c",
@@ -627,6 +623,7 @@ if (is_linux) {
       "nss/lib/freebl/mpi/mp_gf2m.c",
       "nss/lib/freebl/mpi/mp_gf2m.h",
       "nss/lib/freebl/mpi/primes.c",
+      "nss/lib/freebl/nss_build_config_mac.h",
       "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
       "nss/lib/freebl/poly1305/poly1305.c",
       "nss/lib/freebl/poly1305/poly1305.h",
@@ -841,7 +838,7 @@ if (is_linux) {
       ]
     }
     configs += [ "//build/config/compiler:no_chromium_code" ]
-    direct_dependent_configs = [ ":nss_static_config" ]
+    public_configs = [ ":nss_static_config" ]
 
     cflags = []
 
@@ -1070,7 +1067,7 @@ if (is_linux) {
       ]
       cflags += [
         "-include",
-        rebase_path("//third_party/nss/nss/lib/freebl/build_config_mac.h",
+        rebase_path("//third_party/nss/nss/lib/freebl/nss_build_config_mac.h",
                     root_build_dir),
       ]
       defines += [
@@ -1148,12 +1145,13 @@ if (is_linux) {
       ]
     }
 
+    public_deps = [
+      ":nspr",
+    ]
     deps = [
       ":nspr",
       "//third_party/sqlite",
     ]
-
-    forward_dependent_configs_from = [ ":nspr" ]
   }
 }  # Windows/Mac/iOS.