Introduce USE_OPENSSL_CERTS for certificate handling.

crypto/crypto.gyp

Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 95f02b38972fa2e4428f1ba45e98889e123e7d37..97b5a9a7000efa4907563e9a612c9ecd2ccec72a 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -39,6 +39,13 @@
             ],
           ],
         }, {  # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "android"
+            'conditions': [
+                [ 'use_openssl == 1', {

[wtc, 2014/03/20 21:14:56]

1. The indentation level should be two spaces rather than four spaces. (I know
the indentation level is not consistent in this file.)

2. It seems that we should be able to specify the dependency on openssl at a
higher-level in one place, rather than in two places (here and line 64-66)).

[mattm, 2014/03/20 23:40:24]

I agree (see https://codereview.chromium.org/205813004)

[haavardm, 2014/03/21 18:48:16]

Right. I'll wait until your patch is committed, and update my cl accordingly.

+                  'dependencies': [
+                    '../third_party/openssl/openssl.gyp:openssl'
+                  ]
+                }],
+            ],
             'sources!': [
               'hmac_win.cc',
               'openpgp_symmetric_encryption.cc',
@@ -91,7 +98,7 @@
             'mac_security_services_lock.h',
           ],
         }],
-        [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+        [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nspr',
             '../third_party/nss/nss.gyp:nss',
@@ -208,12 +215,12 @@
             'openpgp_symmetric_encryption_unittest.cc',
           ]
         }],
-        [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+        [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nss',
           ],
         }],
-        [ 'OS == "mac"', {
+        [ 'use_openssl == 0 and OS == "mac"', {

[wtc, 2014/03/20 21:14:56]

I think these two blocks can be simply deleted. We should get the dependency on
nss and nspr from the export_dependent_settings of the "crypto" target.

If not, I think at least this block can be deleted.

[haavardm, 2014/03/21 13:08:21]

Thanks, I'll test.

On 2014/03/20 21:14:56, wtc wrote:

[haavardm, 2014/03/24 18:48:52]

Done.

           'dependencies': [
             '../third_party/nss/nss.gyp:nspr',
           ],