Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1

1 files changed, 30 insertions, 43 deletions

diff --git a/security/nss/gtests/freebl_gtest/freebl_gtest.gyp b/security/nss/gtests/freebl_gtest/freebl_gtest.gyp
index 21a87c557..7e11cd103 100644
--- a/security/nss/gtests/freebl_gtest/freebl_gtest.gyp
+++ b/security/nss/gtests/freebl_gtest/freebl_gtest.gyp
@@ -8,10 +8,17 @@
   ],
   'targets': [
     {
-      # Dependencies for tests.
-      'target_name': 'freebl_gtest_deps',
-      'type': 'none',
+      'target_name': 'freebl_gtest',
+      'type': 'executable',
+      'sources': [
+        'mpi_unittest.cc',
+        'dh_unittest.cc',
+        'ecl_unittest.cc',
+        'ghash_unittest.cc',
+        '<(DEPTH)/gtests/common/gtests.cc'
+      ],
       'dependencies': [
+        '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/nss/nss.gyp:nss_static',
@@ -26,57 +33,42 @@
       ],
     },
     {
-      'target_name': 'freebl_gtest',
-      'type': 'executable',
-      'sources': [
-        'mpi_unittest.cc',
-        'dh_unittest.cc',
-        'ecl_unittest.cc',
-        'ghash_unittest.cc',
-        'rsa_unittest.cc',
-        '<(DEPTH)/gtests/common/gtests.cc'
-      ],
-      'dependencies': [
-        'freebl_gtest_deps',
-        '<(DEPTH)/exports.gyp:nss_exports',
-      ],
-    },
-    {
       'target_name': 'prng_gtest',
       'type': 'executable',
       'sources': [
         'prng_kat_unittest.cc',
       ],
       'dependencies': [
-        'freebl_gtest_deps',
         '<(DEPTH)/exports.gyp:nss_exports',
+        '<(DEPTH)/lib/util/util.gyp:nssutil3',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/lib/nss/nss.gyp:nss_static',
+        '<(DEPTH)/lib/pk11wrap/pk11wrap.gyp:pk11wrap_static',
+        '<(DEPTH)/lib/cryptohi/cryptohi.gyp:cryptohi',
+        '<(DEPTH)/lib/certhigh/certhigh.gyp:certhi',
+        '<(DEPTH)/lib/certdb/certdb.gyp:certdb',
+        '<(DEPTH)/lib/base/base.gyp:nssb',
+        '<(DEPTH)/lib/dev/dev.gyp:nssdev',
+        '<(DEPTH)/lib/pki/pki.gyp:nsspki',
+        '<(DEPTH)/lib/ssl/ssl.gyp:ssl',
+        '<(DEPTH)/lib/libpkix/libpkix.gyp:libpkix',
       ],
-    },
-    {
-      'target_name': 'blake2b_gtest',
-      'type': 'executable',
-      'sources': [
-        'blake2b_unittest.cc',
+      'conditions': [
+        [ 'OS=="win"', {
+          'libraries': [
+            'advapi32.lib',
+          ],
+        }],
       ],
-      'dependencies': [
-        'freebl_gtest_deps',
-        '<(DEPTH)/exports.gyp:nss_exports',
+      'defines': [
+        'NSS_USE_STATIC_LIBS'
       ],
     },
   ],
   'target_defaults': {
     'include_dirs': [
-      '<(DEPTH)/lib/freebl/ecl',
       '<(DEPTH)/lib/freebl/mpi',
       '<(DEPTH)/lib/freebl/',
-      '<(DEPTH)/lib/ssl/',
-      '<(DEPTH)/lib/util/',
-      '<(DEPTH)/lib/certdb/',
-      '<(DEPTH)/lib/cryptohi/',
-      '<(DEPTH)/lib/pk11wrap/',
-    ],
-    'defines': [
-      'NSS_USE_STATIC_LIBS',
     ],
     # For test builds we have to set MPI defines.
     'conditions': [
@@ -93,11 +85,6 @@
           'MP_ASSEMBLY_DIV_2DX1D',
         ],
       }],
-      [ 'OS=="win"', {
-        'libraries': [
-          'advapi32.lib',
-        ],
-      }],
     ],
   },
   'variables': {