Reverted because openssl_helper needs to build even on non-openssl builds

Revert 66120 - Simplify gyp files by adding a global glob for openssl/nss

BUG=None
TEST=Build

Review URL: http://codereview.chromium.org/4799003

TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/5014001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66122 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 61 insertions, 12 deletions

diff --git a/base/base.gypi b/base/base.gypi
index 0c702bd..a395299 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -539,11 +539,37 @@
               ],
           },],
           [ 'use_openssl==1', {
+              # TODO(joth): Use a glob to match exclude patterns once the
+              #             OpenSSL file set is complete.
               'sources!': [
+                'crypto/encryptor_nss.cc',
+                'crypto/rsa_private_key_nss.cc',
+                'crypto/signature_creator_nss.cc',
+                'crypto/signature_verifier_nss.cc',
+                'crypto/symmetric_key_nss.cc',
+                'hmac_nss.cc',
+                'nss_util.cc',
+                'nss_util.h',
                 # Note that sha2.cc depends on the NSS files bundled into
                 # chromium; it does not have the _nss postfix as it is required
                 # on platforms besides linux and *bsd.
                 'sha2.cc',
+                'third_party/nss/blapi.h',
+                'third_party/nss/blapit.h',
+                'third_party/nss/sha256.h',
+                'third_party/nss/sha512.cc',
+              ],
+            }, {
+              'sources!': [
+                'crypto/encryptor_openssl.cc',
+                'crypto/rsa_private_key_openssl.cc',
+                'crypto/signature_creator_openssl.cc',
+                'crypto/signature_verifier_openssl.cc',
+                'crypto/symmetric_key_openssl.cc',
+                'hmac_openssl.cc',
+                'openssl_util.cc',
+                'openssl_util.h',
+                'sha2_openssl.cc',
               ],
           },],
         ],
diff --git a/build/common.gypi b/build/common.gypi
index f9e774a..02b99c7 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -653,18 +653,6 @@
           ['toolkit_views==0', {
             'sources/': [ ['exclude', '_views\\.cc$'] ]
           }],
-          ['use_openssl==1', {
-            'sources/': [
-              ['exclude', '_nss\\.(cc|c)$'],
-              ['exclude', '/nss/'],
-              ['exclude', '(/|_|^)nss_[^/]*\\.(cc|c)$'],
-            ],
-          }, {
-            'sources/': [
-              ['exclude', '_openssl\\.cc$'],
-              ['exclude', '(/|_|^)openssl_[^/]*\\.cc$'],
-            ],
-          }],
         ],
       }],
     ],  # target_conditions for 'target_defaults'
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 75b07b5..5fbfc91 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4188,6 +4188,13 @@
             'browser/importer/ie_importer.cc',
           ],
         }],
+        [ 'use_openssl==1', {
+          'sources!': [
+            'browser/importer/nss_decryptor.cc',
+            'browser/importer/nss_decryptor_system_nss.cc',
+            'browser/importer/nss_decryptor_system_nss.h',
+          ],
+        }],
       ],
     },
     {
diff --git a/net/net.gyp b/net/net.gyp
index e983ff1..a2aff3b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -266,8 +266,13 @@
         ],
         [ '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',
@@ -278,6 +283,17 @@
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
+          {  # 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',
+              'base/x509_openssl_util.cc',
+              'base/x509_openssl_util.h',
+             ],
+          },
         ],
         [ 'OS == "win"', {
             'dependencies': [
@@ -708,8 +724,20 @@
         }],
         ['use_openssl==1', {
             'sources!': [
+              'ocsp/nss_ocsp.cc',
+              'ocsp/nss_ocsp.h',
               'socket/dns_cert_provenance_check.cc',
               'socket/dns_cert_provenance_check.h',
+              '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',
+            ],
+          },
+          {  # else !use_openssl: remove the unneeded files
+            'sources!': [
+              'socket/ssl_client_socket_openssl.cc',
+              'socket/ssl_client_socket_openssl.h',
             ],
           },
         ],