| Index: build/config/crypto.gni
 | 
| diff --git a/build/config/crypto.gni b/build/config/crypto.gni
 | 
| index dee6a20e6e3c999c5726aa2605562d38a678b473..f3d8590edade4cb9dd1848f77dfce7f89d019ef2 100644
 | 
| --- a/build/config/crypto.gni
 | 
| +++ b/build/config/crypto.gni
 | 
| @@ -8,9 +8,9 @@
 | 
|  # the global build dependency on it should be removed.
 | 
|  
 | 
|  declare_args() {
 | 
| -  # Use OpenSSL instead of NSS. This is used for Android and is experimental
 | 
| -  # in other cases (see http://crbug.com/62803).
 | 
| -  use_openssl = false
 | 
| +  # Use OpenSSL instead of NSS. This is used for Android and NaCl untrusted
 | 
| +  # code, and is experimental in other cases (see http://crbug.com/62803).
 | 
| +  use_openssl = is_android || is_nacl
 | 
|  }
 | 
|  
 | 
|  if (is_linux && !use_openssl) {
 | 
| 
 |