diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn index 777f99b9bf..b82476c211 100644 --- a/src/base/BUILD.gn +++ b/src/base/BUILD.gn @@ -2236,7 +2236,7 @@ component("base") { "process/set_process_title_linux.h", "system/sys_info_linux.cc", ] - if (!is_cronet_build) { + if (!is_android) { # These dependencies are not required on Android. sources += [ "nix/mime_util_xdg.cc", diff --git a/src/net/socket/client_socket_pool_manager.cc b/src/net/socket/client_socket_pool_manager.cc index 361b37185d..f4ad8d5757 100644 --- a/src/net/socket/client_socket_pool_manager.cc +++ b/src/net/socket/client_socket_pool_manager.cc @@ -14,6 +14,7 @@ #include "base/numerics/safe_conversions.h" #include "build/build_config.h" #include "net/base/load_flags.h" +#include "net/base/net_export.h" #include "net/base/proxy_chain.h" #include "net/base/proxy_server.h" #include "net/dns/public/secure_dns_policy.h" @@ -209,7 +210,7 @@ base::TimeDelta ClientSocketPoolManager::unused_idle_socket_timeout( return base::Seconds(kPreconnectIntervalSec); } -int InitSocketHandleForHttpRequest( +int NET_EXPORT InitSocketHandleForHttpRequest( url::SchemeHostPort endpoint, int request_load_flags, RequestPriority request_priority,