Adding macro to enable changing SSL library (Part 1)

net/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 164 matching lines @@
       "quic/crypto/proof_source_chromium_nss.cc",
       "socket/nss_ssl_util.cc",
       "socket/nss_ssl_util.h",
       "socket/ssl_client_socket_nss.cc",
       "socket/ssl_client_socket_nss.h",
       "socket/ssl_server_socket_nss.cc",
       "socket/ssl_server_socket_nss.h",
       "ssl/token_binding_nss.cc",
     ]
     if (is_ios) {
-      # Always removed for !ios below.
-      net_shared_sources -= [
-        "cert/cert_verify_proc_nss.cc",
-        "cert/cert_verify_proc_nss.h",
-      ]
-    }
-    if (!use_nss_certs && !is_ios) {
-      net_shared_sources -= [ "cert/x509_util_nss.h" ]
+      net_shared_sources -= [ "cert/x509_util_ios.cc" ]

[davidben, 2016/03/17 20:19:45]

Nit: This corresponds to line 310 on the GRD file, right? Probably also want to
remove the header file, not that it matters.

     }
   } else {
     net_shared_sources -= [
       "cert/ct_log_verifier_openssl.cc",
       "cert/ct_objects_extractor_openssl.cc",
       "cert/jwk_serializer_openssl.cc",
       "cert/x509_util_openssl.cc",
       "cert/x509_util_openssl.h",
       "quic/crypto/aead_base_decrypter_openssl.cc",
       "quic/crypto/aead_base_encrypter_openssl.cc",
@@ skipping 84 matching lines @@
       "cert/x509_certificate_nss.cc",
       "ssl/client_cert_store_nss.cc",
       "ssl/client_cert_store_nss.h",
       "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/nsPKCS12Blob.cpp",
       "third_party/mozilla_security_manager/nsPKCS12Blob.h",
     ]
-    if (!is_ios) {
-      # These files are part of the partial implementation of NSS on iOS so
-      # keep them in that case (even though use_nss_certs is not set).
-      net_shared_sources -= [
-        "cert/cert_verify_proc_nss.cc",
-        "cert/cert_verify_proc_nss.h",
-        "cert/test_root_certs_nss.cc",
-        "cert/x509_util_nss_certs.cc",
-        "cert_net/nss_ocsp.cc",
-        "cert_net/nss_ocsp.h",
-      ]
-    }
     if (is_chromeos) {
       # These were already removed on non-ChromeOS.
       net_shared_sources -= [
         "cert/nss_cert_database_chromeos.cc",
         "cert/nss_cert_database_chromeos.h",
         "cert/nss_profile_filter_chromeos.cc",
         "cert/nss_profile_filter_chromeos.h",
       ]
     }
     net_shared_sources -= [
       "ssl/client_key_store.cc",
       "ssl/client_key_store.h",
       "ssl/ssl_platform_key_nss.cc",
     ]
   } else if (use_openssl) {
     # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's
     # libssl, but our bundled copy is not built in OpenSSL ports. Pull that file
     # in directly.
     net_shared_sources += [ "third_party/nss/ssl/cmpcert.c" ]
   }
 
+  if (!use_nss_verifier) {
+    # These files are part of the partial implementation of NSS for
+    # cert verification, so keep them in that case.
+    net_shared_sources -= [
+      "cert/cert_verify_proc_nss.cc",
+      "cert/cert_verify_proc_nss.h",
+      "cert/test_root_certs_nss.cc",
+      "cert/x509_util_nss_certs.cc",
+      "cert_net/nss_ocsp.cc",
+      "cert_net/nss_ocsp.h",
+    ]
+  }
+
   if (is_chromecast && use_nss_certs) {
     net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ]
     net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ]
   }
 
   if (!enable_mdns) {
     net_shared_sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
       "dns/mdns_client.cc",
@@ skipping 366 matching lines @@
     "//net/tools/tld_cleanup",
     "//testing/gmock",
     "//testing/gtest",
     "//url",
   ]
 
   if (!is_ios) {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
-  if (use_nss_certs || is_ios) {
+  if (use_nss_verifier) {
     public_deps += [ "//crypto:platform" ]
   }
 
   if (is_android) {
     sources += [
       "test/spawned_test_server/remote_test_server.cc",
       "test/spawned_test_server/remote_test_server.h",
       "test/spawned_test_server/spawner_communicator.cc",
       "test/spawned_test_server/spawner_communicator.h",
     ]
@@ skipping 769 matching lines @@
     sources -= [
       "http/http_auth_gssapi_posix_unittest.cc",
       "http/mock_gssapi_library_posix.cc",
       "http/mock_gssapi_library_posix.h",
     ]
   }
   if (!use_kerberos) {
     sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
   }
 
-  if (!use_nss_certs && !is_ios) {
-    # Only include this test when on Posix and using NSS for
-    # cert verification or on iOS (which also uses NSS for certs).
+  if (!use_nss_verifier) {
+    # Only include this test when using NSS for cert verification.
     sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
   }
 
   if (!use_openssl_certs) {
     sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
   }
 
   if (!enable_websockets) {
     sources -= [
       "server/http_connection_unittest.cc",
@@ skipping 404 matching lines @@
     "//base",
     "//net",
   ]
 }
 
 buildflag_header("features") {
   header = "net_features.h"
 
   flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ]
 }