Compile remoting client plugin with GN

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 3ac509b8c90f758c3861ff4e29e198521f52b1a0..e35ff9b6f12258cd8f87dda5f86e679b9f2b624e 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -64,8 +64,10 @@ config("net_config") {
 }
 
 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 = [
@@ -110,7 +112,7 @@ component("net") {
     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",
@@ -119,7 +121,7 @@ component("net") {
     ]
   }
 
-  if (is_posix) {
+  if (is_posix && !is_nacl) {
     if (posix_avoid_mmap) {
       sources -= [ "disk_cache/blockfile/mapped_file_posix.cc" ]
     } else {
@@ -127,7 +129,7 @@ component("net") {
     }
   }
 
-  if (disable_file_support) {
+  if (disable_file_support && !is_nacl) {
     sources -= [
       "base/directory_lister.cc",
       "base/directory_lister.h",
@@ -140,7 +142,7 @@ component("net") {
     ]
   }
 
-  if (disable_ftp_support) {
+  if (disable_ftp_support && !is_nacl) {
     sources -= [
       "ftp/ftp_auth_cache.cc",
       "ftp/ftp_auth_cache.h",
@@ -180,17 +182,19 @@ component("net") {
     ]
   }
 
-  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",
@@ -227,7 +231,7 @@ component("net") {
     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",
@@ -274,7 +278,7 @@ component("net") {
     }
   }
 
-  if (!use_openssl_certs) {
+  if (!use_openssl_certs && !is_nacl) {
     sources -= [
       "base/crypto_module_openssl.cc",
       "base/keygen_handler_openssl.cc",
@@ -291,7 +295,7 @@ component("net") {
     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 -= [
@@ -319,7 +323,7 @@ component("net") {
     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",
@@ -362,7 +366,7 @@ component("net") {
       "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.
@@ -413,7 +417,7 @@ component("net") {
     ]
   }
 
-  if (!enable_mdns) {
+  if (!enable_mdns && !is_nacl) {
     sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
@@ -438,7 +442,7 @@ component("net") {
       "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",
@@ -515,7 +519,7 @@ component("net") {
       "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",
@@ -526,6 +530,12 @@ component("net") {
       "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") {