Index: runtime/bin/net/nss.gyp |
diff --git a/runtime/bin/net/nss.gyp b/runtime/bin/net/nss.gyp |
index e1c64e113dab323413fe9daad75176acb888434c..60d21d21ca866650084a29d5485837d2abe8a84c 100644 |
--- a/runtime/bin/net/nss.gyp |
+++ b/runtime/bin/net/nss.gyp |
@@ -17,6 +17,7 @@ |
'variables': { |
# Added by Dart. |
'nss_directory': '../../../third_party/nss', |
+ 'pkcs12_directory': '../../../third_party/pkcs12', |
'conditions': [ |
['OS=="ios"', { |
'exclude_nss_root_certs%': 0, |
@@ -33,6 +34,7 @@ |
'defines': [ |
'DEBUG', |
'_DEBUG', |
+ # 'DEBUG_ASN1D_STATES', |
], |
}, |
'Release': { |
@@ -88,6 +90,54 @@ |
'conditions': [[ 'dart_io_support==1', { |
'targets': [ |
{ |
+ 'target_name': 'pk12util', # Added by Dart (the _dart postfix) |
+ 'type': 'executable', |
+ 'toolsets':['host','target'], |
+ 'dependencies': [ |
+ 'nss_dart', # Added by Dart (the _dart postfix) |
+ ], |
+ 'sources': [ |
+ # Ensure at least one object file is produced, so that MSVC does not |
+ # warn when creating the static/shared library. See the note for |
+ # the 'nssckbi' target for why the 'nss' target was split as such. |
+ '<(pkcs12_directory)/pk12util.c', |
+ '<(pkcs12_directory)/pk12util.h', |
+ '<(pkcs12_directory)/basicutil.c', |
+ '<(pkcs12_directory)/basicutil.h', |
+ '<(pkcs12_directory)/secutil.c', |
+ '<(pkcs12_directory)/secutil.h', |
+ '<(pkcs12_directory)/secpwd.c', |
+ |
+ ], |
+ 'include_dirs': [ |
+ '<(nss_directory)/nspr/pr/include', |
+ '<(nss_directory)/nspr/lib/ds', |
+ '<(nss_directory)/nspr/lib/libc/include', |
+ '<(nss_directory)/nss/lib/base', |
+ '<(nss_directory)/nss/lib/certdb', |
+ '<(nss_directory)/nss/lib/certhigh', |
+ '<(nss_directory)/nss/lib/cryptohi', |
+ '<(nss_directory)/nss/lib/dev', |
+ '<(nss_directory)/nss/lib/freebl', |
+ '<(nss_directory)/nss/lib/freebl/ecl', |
+ '<(nss_directory)/nss/lib/nss', |
+ '<(nss_directory)/nss/lib/pk11wrap', |
+ '<(nss_directory)/nss/lib/pkcs7', |
+ '<(nss_directory)/nss/lib/pki', |
+ '<(nss_directory)/nss/lib/smime', |
+ '<(nss_directory)/nss/lib/softoken', |
+ '<(nss_directory)/nss/lib/util', |
+ '<(pkcs12_directory)', |
+ '<(nss_directory)/../net_nss/ssl', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-lrt', |
+ ]} |
+ |
+ }, |
+ |
+ { |
'target_name': 'nspr_dart', # Added by Dart (the _dart postfix) |
'product_name': 'crnspr', |
'type': '<(component)', |
@@ -1068,6 +1118,19 @@ |
'<(nss_directory)/nss/lib/util/utilpars.h', |
'<(nss_directory)/nss/lib/util/utilparst.h', |
'<(nss_directory)/nss/lib/util/utilrename.h', |
+ '<(pkcs12_directory)/p12creat.c', |
+ '<(pkcs12_directory)/p12d.c', |
+ '<(pkcs12_directory)/p12dec.c', |
+ '<(pkcs12_directory)/p12e.c', |
+ '<(pkcs12_directory)/p12.h', |
+ '<(pkcs12_directory)/p12local.c', |
+ '<(pkcs12_directory)/p12local.h', |
+ '<(pkcs12_directory)/p12plcy.c', |
+ '<(pkcs12_directory)/p12plcy.h', |
+ '<(pkcs12_directory)/p12t.h', |
+ '<(pkcs12_directory)/p12tmpl.c', |
+ '<(pkcs12_directory)/pkcs12.h', |
+ '<(pkcs12_directory)/pkcs12t.h', |
], |
'sources!': [ |
# mpi_arm.c is included by mpi_arm_mac.c. |
@@ -1099,6 +1162,7 @@ |
'SHLIB_VERSION=\"3\"', |
'SOFTOKEN_SHLIB_VERSION=\"3\"', |
'USE_UTIL_DIRECTLY', |
+ # 'DEBUG_ASN1D_STATES', |
], |
'defines!': [ |
# Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. |
@@ -1133,6 +1197,7 @@ |
'<(nss_directory)/nss/lib/softoken', |
'<(nss_directory)/nss/lib/ssl', |
'<(nss_directory)/nss/lib/util', |
+ '<(pkcs12_directory)', |
], |
'direct_dependent_settings': { |
'defines': [ |
@@ -1159,6 +1224,7 @@ |
'<(nss_directory)/nss/lib/smime', |
'<(nss_directory)/nss/lib/softoken', |
'<(nss_directory)/nss/lib/util', |
+ '<(pkcs12_directory)', |
], |
}, |
'msvs_disabled_warnings': [4018, 4101, 4267, ], |