Roll NSS to 169195.

dart/runtime/bin/net/nss.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
-# Revision 165464 (this should agree with "nss_rev" in DEPS).
+# Revision 169195 (this should agree with "nss_rev" in DEPS).
 {
   # Added by Dart. All Dart comments refer to the following block or line.
   'includes': [
     '../../tools/gyp/runtime-configurations.gypi',
     '../../tools/gyp/nss_configurations.gypi',
   ],
   'variables': {
     # Added by Dart.
     'nss_directory': '../../../third_party/nss',
     'conditions': [
@@ skipping 60 matching lines @@
         'defines!': [
           'WIN32_LEAN_AND_MEAN',
         ],
       }],
     ],
   },
   # Added by Dart.  We do not indent, so diffs with the original are clearer.
   'conditions': [[ 'dart_io_support==1', {
   'targets': [
     {
-      'target_name': 'nspr_dart',
+      'target_name': 'nspr_dart',  # Added by Dart (the _dart postfix)
       'product_name': 'crnspr',
       'type': '<(component)',
       # Changed by Dart: '<(nss_directory)/' added to all paths.
       'sources': [
         # Added by Dart.
         'os_linux.S',
         '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.c',
         '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.h',
         '<(nss_directory)/mozilla/nsprpub/lib/ds/plarenas.h',
         '<(nss_directory)/mozilla/nsprpub/lib/ds/plhash.c',
@@ skipping 206 matching lines @@
             'HAVE_CRT_EXTERNS_H',
             'HAVE_DLADDR',
             'HAVE_LCHOWN',
             'HAVE_SOCKLEN_T',
             'HAVE_STRERROR',
           ],
           # Changed by Dart:
           # nss_directory contains .., which is bad in a regular expression.
           # So we use the partial match by dropping '^' from '^mozilla/...
           'sources/': [
-            ['exclude', 'mozilla/nsprpub/pr/src/md/windows/'],
-            ['exclude', 'mozilla/nsprpub/pr/src/threads/combined/'],
+            ['exclude', '<(nss_directory)/mozilla/nsprpub/pr/src/md/windows/'],
+            ['exclude', '<(nss_directory)/mozilla/nsprpub/pr/src/threads/combined/'],
           ],
           'sources!': [
             # Added by Dart.
             'os_linux.S',
             '<(nss_directory)/mozilla/nsprpub/pr/src/io/prdir.c',
             '<(nss_directory)/mozilla/nsprpub/pr/src/io/prfile.c',
             '<(nss_directory)/mozilla/nsprpub/pr/src/io/prio.c',
             '<(nss_directory)/mozilla/nsprpub/pr/src/io/prsocket.c',
             # os_Darwin_x86.s and os_Darwin_x86_64.s are included by
             # os_Darwin.s.
@@ skipping 77 matching lines @@
             '_CRT_NONSTDC_NO_WARNINGS',
           ],
           'sources!': [
             # Added by Dart.
             'os_linux.S',
           ],
           # Changed by Dart:
           # nss_directory contains .., which is bad in a regular expression.
           # So we use the partial match by dropping '^' from '^mozilla/...
           'sources/': [
-            ['exclude', 'mozilla/nsprpub/pr/src/md/unix/'],
-            ['exclude', 'mozilla/nsprpub/pr/src/pthreads/'],
+            ['exclude', '<(nss_directory)/mozilla/nsprpub/pr/src/md/unix/'],
+            ['exclude', '<(nss_directory)/mozilla/nsprpub/pr/src/pthreads/'],
           ],
           'conditions': [
             ['target_arch=="ia32"', {
               'defines': [
                 '_X86_',
               ],
             }],
           ],
         }],
         ['component == "static_library"', {
@@ skipping 19 matching lines @@
             ],
           },
           'cflags': [
             '-Wno-incompatible-pointer-types',
             '-Wno-pointer-sign',
           ],
         }],
       ],
     },
     {
-      'target_name': 'nss_dart',
+      'target_name': 'nss_dart',  # Added by Dart (the _dart postfix)
       'product_name': 'crnss',
       'type': '<(component)',
       'dependencies': [
-        'nss_static_dart',
+        'nss_static_dart',  # Added by Dart (the _dart postfix)
       ],
       'export_dependent_settings': [
-        'nss_static_dart',
+        'nss_static_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.
         '<(nss_directory)/mozilla/security/nss/lib/nss/nssver.c',
       ],
       'conditions': [
         ['exclude_nss_root_certs==0', {
           'dependencies': [
-            'nssckbi_dart',
+            'nssckbi_dart',  # Added by Dart (the _dart postfix)
           ],
           'export_dependent_settings': [
-            'nssckbi_dart',
+            'nssckbi_dart',  # Added by Dart (the _dart postfix)
           ],
         }],
         ['OS == "mac" and component == "shared_library"', {
           'xcode_settings': {
             'OTHER_LDFLAGS': ['-all_load'],
           },
         }],
         ['OS == "win" and component == "shared_library"', {
           'sources': [
             '<(nss_directory)/mozilla/security/nss/exports_win.def',
           ],
         }],
       ],
     },
     {
       # This is really more of a pseudo-target to work around the fact that
       # a single static_library target cannot contain two object files of the
       # same name (hash.o / hash.obj). Logically, this is part of the
       # 'nss_static' target. By separating it out, it creates a possible
       # circular dependency between 'nss_static' and 'nssckbi' when
       # 'exclude_nss_root_certs' is not specified, as 'nss_static' depends on
       # the 'builtinsC_GetFunctionList' exported by this target. This is an
       # artifact of how NSS is being statically built, which is not an
       # officially supported configuration - normally, 'nssckbi.dll/so' would
       # depend on libnss3.dll/so, and the higher layer caller would instruct
       # libnss3.dll to dynamically load nssckbi.dll, breaking the circle.
       #
       # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency
       # without requiring nssckbi to be built as a shared library.
-      'target_name': 'nssckbi_dart',
+      'target_name': 'nssckbi_dart',  # Added by Dart (the _dart postfix)
       'product_name': 'crnssckbi',
       'type': 'static_library',
       # This target is an implementation detail - the public dependencies
       # should be on 'nss'.
       'suppress_wildcard': 1,
       'sources': [
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/anchor.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bfind.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/binst.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bobject.c',
@@ skipping 27 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckmdt.h',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckt.h',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/object.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/session.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/sessobj.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/slot.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/token.c',
         '<(nss_directory)/mozilla/security/nss/lib/ckfw/wrap.c',
       ],
       'dependencies': [
-        'nss_static_dart',
+        'nss_static_dart',  # Added by Dart (the _dart postfix)
       ],
       'export_dependent_settings': [
-        'nss_static_dart',
+        'nss_static_dart',  # Added by Dart (the _dart postfix)
       ],
       'include_dirs': [
         '<(nss_directory)/mozilla/security/nss/lib/ckfw',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins',
         ],
       },
     },
     {
-      'target_name': 'nss_static_dart',
+      'target_name': 'nss_static_dart',  # Added by Dart (the _dart postfix)
       'type': 'static_library',
       # This target is an implementation detail - the public dependencies
       # should be on 'nss'.
       'suppress_wildcard': 1,
       'sources': [
         '<(nss_directory)/mozilla/security/nss/lib/base/arena.c',
         '<(nss_directory)/mozilla/security/nss/lib/base/base.h',
         '<(nss_directory)/mozilla/security/nss/lib/base/baset.h',
         '<(nss_directory)/mozilla/security/nss/lib/base/error.c',
         '<(nss_directory)/mozilla/security/nss/lib/base/errorval.c',
@@ skipping 40 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/certhigh/xcrldist.c',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/cryptohi.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/cryptoht.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/dsautil.c',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/key.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/keyhi.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/keyi.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/keyt.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/keythi.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/sechash.c',
+        '<(nss_directory)/mozilla/security/nss/lib/cryptohi/sechash.h',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/seckey.c',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/secsign.c',
         '<(nss_directory)/mozilla/security/nss/lib/cryptohi/secvfy.c',
         '<(nss_directory)/mozilla/security/nss/lib/dev/ckhelper.c',
         '<(nss_directory)/mozilla/security/nss/lib/dev/ckhelper.h',
         '<(nss_directory)/mozilla/security/nss/lib/dev/dev.h',
         '<(nss_directory)/mozilla/security/nss/lib/dev/devm.h',
         '<(nss_directory)/mozilla/security/nss/lib/dev/devslot.c',
         '<(nss_directory)/mozilla/security/nss/lib/dev/devt.h',
         '<(nss_directory)/mozilla/security/nss/lib/dev/devtm.h',
@@ skipping 28 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecl.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecl_curve.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecl_gf.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecl_mult.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecp.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecp_aff.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecp_jac.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecp_jm.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ecp_mont.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/ecl/ec_naf.c',
-        '<(nss_directory)/mozilla/security/nss/lib/freebl/hasht.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/jpake.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/md2.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/md5.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/logtab.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi-config.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mplogic.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mplogic.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpmontg.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpprime.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mpprime.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mp_gf2m-priv.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/primes.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/pqg.c',
+        '<(nss_directory)/mozilla/security/nss/lib/freebl/pqg.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/rawhash.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/rijndael.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/rijndael.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/rijndael32.tab',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/rsa.c',
-        '<(nss_directory)/mozilla/security/nss/lib/freebl/sechash.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/secmpi.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/secrng.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/seed.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/seed.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/sha256.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/sha512.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/sha_fast.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/sha_fast.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/shsign.h',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/shvfy.c',
@@ skipping 194 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11pqg.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11priv.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11pub.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11sdr.c',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11sdr.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11skey.c',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11slot.c',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/pk11util.c',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/secmod.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/secmodi.h',
+        '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/secmodt.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/secmodti.h',
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/secpkcs5.h',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/certread.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7common.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7create.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7decode.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7encode.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7local.c',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/p7local.h',
         '<(nss_directory)/mozilla/security/nss/lib/pkcs7/pkcs7t.h',
@@ skipping 29 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/softoken/fipstokn.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/jpakesftk.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lgglue.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lgglue.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lowkey.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lowkeyi.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lowkeyti.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lowpbe.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/lowpbe.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/padbuf.c',
-        '<(nss_directory)/mozilla/security/nss/lib/softoken/pk11init.h',
-        '<(nss_directory)/mozilla/security/nss/lib/softoken/pk11pars.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/pkcs11.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/pkcs11c.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/pkcs11i.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/pkcs11ni.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/pkcs11u.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/rsawrapr.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sdb.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sdb.h',
-        '<(nss_directory)/mozilla/security/nss/lib/softoken/secmodt.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkdb.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkdb.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkdbt.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkdbti.h',
-        '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkmod.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkpars.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkpars.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/sftkpwd.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/softkver.c',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/softkver.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/softoken.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/softoknt.h',
         '<(nss_directory)/mozilla/security/nss/lib/softoken/tlsprf.c',
         '<(nss_directory)/mozilla/security/nss/lib/ssl/sslerr.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/SECerrs.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/base64.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/ciferfam.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/derdec.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/derenc.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/dersubr.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/dertime.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/errstrs.c',
+        '<(nss_directory)/mozilla/security/nss/lib/util/hasht.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssb64.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssb64d.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssb64e.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssb64t.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssilckt.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssilock.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssilock.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nsslocks.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssrwlk.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/nssrwlk.h',
@@ skipping 25 matching lines @@
         '<(nss_directory)/mozilla/security/nss/lib/util/secitem.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/secitem.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/secoid.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/secoid.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/secoidt.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/secport.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/secport.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/sectime.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/templates.c',
         '<(nss_directory)/mozilla/security/nss/lib/util/utf8.c',
+        '<(nss_directory)/mozilla/security/nss/lib/util/utilmod.c',
+        '<(nss_directory)/mozilla/security/nss/lib/util/utilmodt.h',
+        '<(nss_directory)/mozilla/security/nss/lib/util/utilpars.c',
+        '<(nss_directory)/mozilla/security/nss/lib/util/utilpars.h',
+        '<(nss_directory)/mozilla/security/nss/lib/util/utilparst.h',
         '<(nss_directory)/mozilla/security/nss/lib/util/utilrename.h',
       ],
       'sources!': [
         # primes.c is included by mpprime.c.
         '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/primes.c',
         # unix_rand.c and win_rand.c are included by sysrand.c.
         '<(nss_directory)/mozilla/security/nss/lib/freebl/unix_rand.c',
         '<(nss_directory)/mozilla/security/nss/lib/freebl/win_rand.c',
         # debug_module.c is included by pk11load.c.
         '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/debug_module.c',
       ],
       'dependencies': [
-        'nspr_dart',
-        'sqlite.gyp:sqlite_dart',
+        'nspr_dart',  # Added by Dart (the _dart postfix)
+        'sqlite.gyp:sqlite_dart',  # Changed by Dart prefix ../sqllite removed _dart postfix added.
       ],
       'export_dependent_settings': [
-        'nspr_dart',
+        'nspr_dart',  # Added by Dart (the _dart postfix)
       ],
       'defines': [
         'MP_API_COMPATIBLE',
         'NSS_DISABLE_DBM',
         'NSS_ENABLE_ECC',
         'NSS_STATIC',
         'NSS_USE_STATIC_LIBS',
         'RIJNDAEL_INCLUDE_TABLES',
         'SHLIB_VERSION=\"3\"',
         'SOFTOKEN_SHLIB_VERSION=\"3\"',
@@ skipping 64 matching lines @@
       'conditions': [
         ['exclude_nss_root_certs==1', {
           'defines': [
             'NSS_DISABLE_ROOT_CERTS',
           ],
         }],
         ['exclude_nss_libpkix==1', {
           'defines': [
             'NSS_DISABLE_LIBPKIX',
           ],
+          # Changed by Dart:
+          # nss_directory contains .., which is bad in a regular expression.
+          # So we use the partial match by dropping '^' from '^mozilla/...
           'sources/': [
-            ['exclude', 'mozilla/security/nss/lib/libpkix/'],
+            ['exclude', '<(nss_directory)/mozilla/security/nss/lib/libpkix/'],

[Bill Hesse, 2012/11/22 16:10:41]

The point of the comment is that we don't want to put the value of nss_directory
in the regexp that 'exclude' uses, since it won't work well.  Therefore we do a
partial match of the path, rather than an anchored match, starting with ^.
I don't think we should all <(nss_directory) here.  But the comment should be
here.

[Søren Gjesse, 2012/11/23 10:12:21]

Good catch. Removed <(nss_directory)/ from the excludes.

           ],
           'sources!': [
             '<(nss_directory)/mozilla/security/nss/lib/certhigh/certvfypkix.c',
             '<(nss_directory)/mozilla/security/nss/lib/certhigh/certvfypkixprint.c',
           ],
+          # Changed by Dart:
+          # nss_directory contains .., which is bad in a regular expression.
+          # So we use the partial match by dropping '^' from '^mozilla/...
           'include_dirs/': [
-            ['exclude', 'mozilla/security/nss/lib/libpkix/'],
+            ['exclude', '<(nss_directory)/mozilla/security/nss/lib/libpkix/'],
           ],
         }],
         ['target_arch=="ia32"', {
           'sources/': [
             ['exclude', 'amd64'],
           ],
         }],
-        # Added by Dart.
         ['OS=="linux"', {
           'defines': [
             'XP_UNIX',
             'HAVE_STRERROR',
             'SHLIB_SUFFIX=\"so\"',
             'SHLIB_PREFIX=\"lib\"',
             'SHLIB_VERSION=\"3\"',
             'SOFTOKEN_SHLIB_VERSION=\"3\"',
             'SOFTOKEN_LIB_NAME=\"libsoftokn3.so\"',
           ],
@@ skipping 89 matching lines @@
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
   }]],
 }