Make USE_OPENSSL and USE_NSS mutually exclusive

net/net.gyp

 # Copyright (c) 2010 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 216 matching lines @@
             ],
           'message': 'Generating SSL False Start blacklist',
           'process_outputs_as_sources': 1,
         },
       ],
       'conditions': [
         [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
             'dependencies': [
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gdk',
-              '../build/linux/system.gyp:nss',
               '../build/linux/system.gyp:libresolv',
             ],
+            'conditions': [
+              ['use_openssl==1', {
+                'dependencies': [
+                  '../build/linux/system.gyp:openssl',
+                ],
+              }, {  # else: not using openssl. Use NSS.
+                'dependencies': [
+                  '../build/linux/system.gyp:nss',
+                ],
+              }],
+            ],
           },
           {  # else: OS is not in the above list
             'sources!': [
               'base/cert_database_nss.cc',
               'base/keygen_handler_nss.cc',
               'base/x509_certificate_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
               'third_party/mozilla_security_manager/nsNSSCertTrust.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
         ],
-        [ 'use_openssl == 1 and OS == "linux"', {
-            # When building for OpenSSL, we need to exclude some NSS files.
-            # TODO(bulach): remove once we fully support OpenSSL.
+        [ 'use_openssl==1', {
             'sources!': [
               'base/cert_database_nss.cc',
+              'base/dnssec_keyset.cc',
+              'base/dnssec_keyset.h',
               'base/keygen_handler_nss.cc',
+              'base/nss_memio.c',
+              'base/nss_memio.h',
               'base/x509_certificate_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
               'third_party/mozilla_security_manager/nsNSSCertTrust.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
-          { # else: not using openssl.
+          {  # else: not using openssl.
             'sources!': [
               'base/cert_database_openssl.cc',
               'base/keygen_handler_openssl.cc',
               'base/openssl_util.cc',
               'base/openssl_util.h',
               'base/x509_certificate_openssl.cc',
              ],
           },
         ],
         [ 'OS == "win"', {
@@ skipping 410 matching lines @@
           'dependencies': [
             '../v8/tools/gyp/v8.gyp:v8',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
              'proxy/proxy_config_service_linux.cc',
              'proxy/proxy_config_service_linux.h',
           ],
         }],
-        ['use_openssl==1 and OS == "linux"', {
+        ['use_openssl==1', {
             'dependencies': [
               '../build/linux/system.gyp:openssl',
             ],
             'sources!': [
               'socket/ssl_client_socket_nss.cc',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_client_socket_nss_factory.cc',
               'socket/ssl_client_socket_nss_factory.h',
             ],
           },
@@ skipping 250 matching lines @@
         ],
         [ 'OS == "linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
-        [ 'use_openssl == 1 and OS == "linux"', {
-            # When building for OpenSSL, we need to exclude some NSS files.
-            # TODO(bulach): remove once we fully support OpenSSL.
+        [ 'use_openssl==1', {
+            # When building for OpenSSL, we need to exclude NSS specific tests.
+            # TODO(bulach): Add equivalent tests when the underlying
+            #               functionality is ported to OpenSSL.
             'sources!': [
               'base/cert_database_nss_unittest.cc',
+              'base/dnssec_unittest.cc',
             ],
           },
         ],
         [ 'OS == "win"', {
             'sources!': [
               'http/http_auth_gssapi_posix_unittest.cc',
             ],
             # This is needed to trigger the dll copy step on windows.
             # TODO(mark): Specifying this here shouldn't be necessary.
             'dependencies': [
@@ skipping 109 matching lines @@
         'test/test_server.h',
       ],
       'conditions': [
         ['inside_chromium_build==1', {
           'dependencies': [
             '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-          'dependencies': [
-            '../build/linux/system.gyp:nss',
+          'conditions': [
+            ['use_openssl==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:openssl',
+              ]
+            }, {
+              'dependencies': [
+                '../build/linux/system.gyp:nss',
+              ],
+            }],
           ],
         }],
         ['OS == "linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
-        ['use_openssl == 1 and OS == "linux"', {
-            'dependencies': [
-              '../build/linux/system.gyp:openssl',
-            ]
-        }],
       ],
     },
     {
       'target_name': 'net_resources',
       'type': 'none',
       'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
       'variables': {
         'grit_cmd': ['python', '../tools/grit/grit.py'],
         'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
         'input_paths': [
@@ skipping 196 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: