crypto.gyp: move openssl dependency into use_openssl section. Remove redundant source excludes.

crypto/crypto.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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'crypto.gypi',
@@ skipping 36 matching lines @@
             ],
         }],
         [ 'OS != "mac" and OS != "ios"', {
           'sources!': [
             'apple_keychain.h',
             'mock_apple_keychain.cc',
             'mock_apple_keychain.h',
           ],
         }],
         [ 'OS == "android"', {
-            'dependencies': [
-              '../third_party/openssl/openssl.gyp:openssl',
-            ],
-            'sources/': [
-              ['exclude', 'ec_private_key_nss\.cc$'],
-              ['exclude', 'ec_signature_creator_nss\.cc$'],
-              ['exclude', 'encryptor_nss\.cc$'],
-              ['exclude', 'hmac_nss\.cc$'],
-              ['exclude', 'signature_verifier_nss\.cc$'],
-              ['exclude', 'symmetric_key_nss\.cc$'],
-            ],
             'includes': [
               '../build/android/cpufeatures.gypi',
             ],
         }],
         [ 'os_bsd==1', {
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
               ],
             },
@@ skipping 27 matching lines @@
           'sources!': [
             'capi_util.h',
             'capi_util.cc',
           ],
         }],
         [ 'OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         }],
         [ 'use_openssl==1', {
+            'dependencies': [
+              '../third_party/openssl/openssl.gyp:openssl',
+            ],
             # TODO(joth): Use a glob to match exclude patterns once the
             #             OpenSSL file set is complete.
             'sources!': [
               'ec_private_key_nss.cc',
               'ec_signature_creator_nss.cc',
               'encryptor_nss.cc',
               'hmac_nss.cc',
               'nss_util.cc',
               'nss_util.h',
               'openpgp_symmetric_encryption.cc',
@@ skipping 133 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }