Compile remoting client plugin with GN

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/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 46 matching lines @@
   defines = []
   if (posix_avoid_mmap) {
     defines += [ "POSIX_AVOID_MMAP" ]
   }
   if (disable_file_support) {
     defines += [ "DISABLE_FILE_SUPPORT" ]
   }
 }
 
 component("net") {
-  sources =
-      gypi_values.net_nacl_common_sources + gypi_values.net_non_nacl_sources
+  sources = gypi_values.net_nacl_common_sources
+  if (!is_nacl) {
+    sources += gypi_values.net_non_nacl_sources
+  }
 
   cflags = []
   defines = [
     # TODO(GYP) Note that the GYP file supports linux_link_kerberos (defaults to
     # 0) which implies that we run pkg_config on kerberos and link to that
     # rather than setting this define which will dynamically open it. That
     # doesn't seem to be set in the regular builds, so we're skipping this
     # capability here.
     "DLOPEN_KERBEROS",
     "NET_IMPLEMENTATION",
@@ skipping 24 matching lines @@
     "//third_party/protobuf:protobuf_lite",
     "//third_party/zlib",
     "//url",
   ]
 
   if (use_kerberos) {
     defines += [ "USE_KERBEROS" ]
     if (is_android) {
       include_dirs += [ "/usr/include/kerberosV" ]
     }
-  } else {
+  } else if (!is_nacl) {

[davidben, 2015/08/28 17:08:27]

This logic is somewhat hard to follow. I think it might make more sense to wrap
the entire thing (or perhaps feature-by-feature?) in an if (!is_nacl), since
this is all pertaining to random addons that are not in the core NaCl subset.

(Arguably we should be splitting //net up somewhat into two libraries. One's the
core socket stuff that NaCl needs and the other's the higher-level bits. But
that's an idle thought and probably not something to do in this CL. I haven't
thought about it any.)

[Sergey Ulanov, 2015/08/31 21:59:33]

Done.

     sources -= [
       "http/http_auth_gssapi_posix.cc",
       "http/http_auth_gssapi_posix.h",
       "http/http_auth_handler_negotiate.cc",
       "http/http_auth_handler_negotiate.h",
     ]
   }
 
-  if (is_posix) {
+  if (is_posix && !is_nacl) {
     if (posix_avoid_mmap) {
       sources -= [ "disk_cache/blockfile/mapped_file_posix.cc" ]
     } else {
       sources -= [ "disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc" ]
     }
   }
 
-  if (disable_file_support) {
+  if (disable_file_support && !is_nacl) {
     sources -= [
       "base/directory_lister.cc",
       "base/directory_lister.h",
       "url_request/file_protocol_handler.cc",
       "url_request/file_protocol_handler.h",
       "url_request/url_request_file_dir_job.cc",
       "url_request/url_request_file_dir_job.h",
       "url_request/url_request_file_job.cc",
       "url_request/url_request_file_job.h",
     ]
   }
 
-  if (disable_ftp_support) {
+  if (disable_ftp_support && !is_nacl) {
     sources -= [
       "ftp/ftp_auth_cache.cc",
       "ftp/ftp_auth_cache.h",
       "ftp/ftp_ctrl_response_buffer.cc",
       "ftp/ftp_ctrl_response_buffer.h",
       "ftp/ftp_directory_listing_parser.cc",
       "ftp/ftp_directory_listing_parser.h",
       "ftp/ftp_directory_listing_parser_ls.cc",
       "ftp/ftp_directory_listing_parser_ls.h",
       "ftp/ftp_directory_listing_parser_netware.cc",
@@ skipping 19 matching lines @@
       "ftp/ftp_transaction_factory.h",
       "ftp/ftp_util.cc",
       "ftp/ftp_util.h",
       "url_request/ftp_protocol_handler.cc",
       "url_request/ftp_protocol_handler.h",
       "url_request/url_request_ftp_job.cc",
       "url_request/url_request_ftp_job.h",
     ]
   }
 
-  if (enable_built_in_dns) {
-    defines += [ "ENABLE_BUILT_IN_DNS" ]
-  } else {
-    sources -= [
-      "dns/address_sorter_posix.cc",
-      "dns/address_sorter_posix.h",
-      "dns/dns_client.cc",
-    ]
+  if (!is_nacl) {
+    if (enable_built_in_dns) {
+      defines += [ "ENABLE_BUILT_IN_DNS" ]
+    } else {
+      sources -= [
+        "dns/address_sorter_posix.cc",
+        "dns/address_sorter_posix.h",
+        "dns/dns_client.cc",
+      ]
+    }
   }
 
-  if (use_openssl) {
+  if (use_openssl && !is_nacl) {
     sources -= [
       "base/nss_memio.c",
       "base/nss_memio.h",
       "cert/ct_log_verifier_nss.cc",
       "cert/ct_objects_extractor_nss.cc",
       "cert/jwk_serializer_nss.cc",
       "cert/scoped_nss_types.h",
       "cert/x509_util_nss.cc",
       "quic/crypto/aead_base_decrypter_nss.cc",
       "quic/crypto/aead_base_encrypter_nss.cc",
@@ skipping 16 matching lines @@
         "cert/cert_verify_proc_nss.cc",
         "cert/cert_verify_proc_nss.h",
       ]
     }
     if (is_win) {
       sources -= [ "cert/sha256_legacy_support_nss_win.cc" ]
     }
     if (!use_nss_certs && !is_ios) {
       sources -= [ "cert/x509_util_nss.h" ]
     }
-  } else {
+  } else if (!is_nacl) {
     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",
       "quic/crypto/aes_128_gcm_12_decrypter_openssl.cc",
       "quic/crypto/aes_128_gcm_12_encrypter_openssl.cc",
@@ skipping 26 matching lines @@
     }
     if (use_nss_certs) {
       sources -= [
         "ssl/client_key_store.cc",
         "ssl/client_key_store.h",
         "ssl/ssl_platform_key_nss.cc",
       ]
     }
   }
 
-  if (!use_openssl_certs) {
+  if (!use_openssl_certs && !is_nacl) {
     sources -= [
       "base/crypto_module_openssl.cc",
       "base/keygen_handler_openssl.cc",
       "base/openssl_private_key_store.h",
       "base/openssl_private_key_store_memory.cc",
       "cert/cert_database_openssl.cc",
       "cert/cert_verify_proc_openssl.cc",
       "cert/cert_verify_proc_openssl.h",
       "cert/test_root_certs_openssl.cc",
       "cert/x509_certificate_openssl.cc",
       "ssl/openssl_client_key_store.cc",
       "ssl/openssl_client_key_store.h",
     ]
     if (is_android) {
       sources -= [ "base/openssl_private_key_store_android.cc" ]
     }
-  } else {
+  } else if (!is_nacl) {
     if (is_android) {
       # Android doesn't use these even when using OpenSSL.
       sources -= [
         "base/openssl_private_key_store_memory.cc",
         "cert/cert_database_openssl.cc",
         "cert/cert_verify_proc_openssl.cc",
         "cert/test_root_certs_openssl.cc",
       ]
     }
 
     # TODO(davidben): Remove these exclusions when use_openssl_certs builds also
     # use the SSLPrivateKey machinery.
     sources -= [
       "ssl/threaded_ssl_private_key.cc",
       "ssl/threaded_ssl_private_key.h",
     ]
   }
 
   if (use_glib && !is_chromeos) {
     configs += [ "//build/config/linux:gconf" ]
     deps += [ "//build/config/linux:gio" ]
   }
 
   if (is_linux) {
     configs += [ "//build/config/linux:libresolv" ]
   }
 
-  if (!use_nss_certs) {
+  if (!use_nss_certs && !is_nacl) {
     sources -= [
       "base/crypto_module_nss.cc",
       "base/keygen_handler_nss.cc",
       "cert/cert_database_nss.cc",
       "cert/nss_cert_database.cc",
       "cert/nss_cert_database.h",
       "cert/x509_certificate_nss.cc",
       "ssl/client_cert_store_nss.cc",
       "ssl/client_cert_store_nss.h",
       "third_party/mozilla_security_manager/nsKeygenHandler.cpp",
@@ skipping 22 matching lines @@
         "cert/nss_cert_database_chromeos.h",
         "cert/nss_profile_filter_chromeos.cc",
         "cert/nss_profile_filter_chromeos.h",
       ]
     }
     sources -= [
       "ssl/client_key_store.cc",
       "ssl/client_key_store.h",
       "ssl/ssl_platform_key_nss.cc",
     ]
-  } else if (use_openssl) {
+  } else if (use_openssl_certs) {

[davidben, 2015/08/28 17:08:27]

I believe this breaks the GN Linux build. This should be use_openssl.
use_openssl_certs and use_openssl are semi-orthogonal. (At this point the only
case where use_openssl isn't true is iOS, although the !use_openssl NSS build is
still around in case we need to roll back. Possibly we should just delete now
that we've branched though, I dunno.)

[Sergey Ulanov, 2015/08/31 21:59:33]

I'm not sure why I changed this line. Reverted now.

     # 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.
     sources += [ "third_party/nss/ssl/cmpcert.c" ]
   }
 
   if (!enable_websockets) {
     sources -= [
       "websockets/websocket_basic_handshake_stream.cc",
       "websockets/websocket_basic_handshake_stream.h",
@@ skipping 30 matching lines @@
       "websockets/websocket_handshake_stream_create_helper.cc",
       "websockets/websocket_handshake_stream_create_helper.h",
       "websockets/websocket_inflater.cc",
       "websockets/websocket_inflater.h",
       "websockets/websocket_mux.h",
       "websockets/websocket_stream.cc",
       "websockets/websocket_stream.h",
     ]
   }
 
-  if (!enable_mdns) {
+  if (!enable_mdns && !is_nacl) {
     sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
       "dns/mdns_client.cc",
       "dns/mdns_client.h",
       "dns/mdns_client_impl.cc",
       "dns/mdns_client_impl.h",
       "dns/record_parsed.cc",
       "dns/record_parsed.h",
       "dns/record_rdata.cc",
       "dns/record_rdata.h",
     ]
   }
 
   if (is_win) {
     sources -= [
       "http/http_auth_handler_ntlm_portable.cc",
       "socket/socket_libevent.cc",
       "socket/socket_libevent.h",
       "socket/tcp_socket_libevent.cc",
       "socket/tcp_socket_libevent.h",
       "udp/udp_socket_libevent.cc",
       "udp/udp_socket_libevent.h",
     ]
-  } else {  # !is_win
+  } else if (!is_nacl) {  # !is_win
     sources -= [
       "base/winsock_init.cc",
       "base/winsock_init.h",
       "base/winsock_util.cc",
       "base/winsock_util.h",
       "proxy/proxy_resolver_winhttp.cc",
       "proxy/proxy_resolver_winhttp.h",
     ]
   }
 
@@ skipping 56 matching lines @@
     ]
     set_sources_assignment_filter(sources_assignment_filter)
     deps += [ ":net_jni_headers" ]
   }
 
   if (use_icu_alternatives_on_android) {
     sources += [
       "base/net_string_util_icu_alternatives_android.cc",
       "base/net_string_util_icu_alternatives_android.h",
     ]
-  } else {
+  } else if (!is_nacl) {
     deps += [
       "//base:i18n",
       "//third_party/icu",
     ]
     sources += [
       "base/filename_util_icu.cc",
       "base/net_string_util_icu.cc",
       "base/net_util_icu.cc",
     ]
   }
+
+  if (is_nacl) {
+    deps -= [ "//sdch", "//base:prefs" ]
+    public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    defines += [ "USE_OPENSSL_CERTS=1" ]

[davidben, 2015/08/28 17:08:27]

Instead tweak the definition of use_openssl_certs in build/config/crypto.gni.

[Sergey Ulanov, 2015/08/31 21:59:33]

Done.

+  }
 }
 
 grit("net_resources") {
   source = "base/net_resources.grd"
   use_qualified_include = true
   outputs = [
     "grit/net_resources.h",
     "net_resources.pak",
   ]
 }
@@ skipping 1161 matching lines @@
   if (enable_websockets) {
     sources += [ "websockets/websocket_frame_perftest.cc" ]
   }
 
   if (use_v8_in_net) {
     deps += [ ":net_with_v8" ]
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 }