diff options
| author | yuweih <yuweih@chromium.org> | 2016-03-16 18:46:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 01:48:47 +0000 |
| commit | e8f2d518b2337b2ae8736ee0f032d2fffc8b16b8 (patch) | |
| tree | 9350a7155b68352285fe17a2aa14c756041de5b8 /remoting/client | |
| parent | b8b45d19a6322d1d022c491e8813ee4ed252663c (diff) | |
| download | chromium_src-e8f2d518b2337b2ae8736ee0f032d2fffc8b16b8.zip chromium_src-e8f2d518b2337b2ae8736ee0f032d2fffc8b16b8.tar.gz chromium_src-e8f2d518b2337b2ae8736ee0f032d2fffc8b16b8.tar.bz2 | |
Reduce APK size by disabling WebRTC.
Reduced official build size from 7.9MB to 6.4MB. Can reenable WebRTC by changing the BUILD.gn file.
BUG=595038
Review URL: https://codereview.chromium.org/1806963002
Cr-Commit-Position: refs/heads/master@{#381636}
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/BUILD.gn | 6 | ||||
| -rw-r--r-- | remoting/client/chromoting_client.cc | 8 | ||||
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.cc | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn index 7d96c30..11c1e14 100644 --- a/remoting/client/BUILD.gn +++ b/remoting/client/BUILD.gn @@ -16,6 +16,7 @@ source_set("client") { configs += [ "//build/config/compiler:wexit_time_destructors", "//remoting:version", + "//remoting:enable_webrtc_remoting_client", ] deps = [ @@ -58,7 +59,10 @@ source_set("unit_tests") { ] set_sources_assignment_filter(sources_assignment_filter) - configs += [ "//remoting:version" ] + configs += [ + "//remoting:version", + "//remoting:enable_webrtc_remoting_client", + ] deps = [ ":client", diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index eedd1c9..bed7215 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -73,11 +73,11 @@ void ChromotingClient::Start( if (!connection_) { if (protocol_config_->webrtc_supported()) { DCHECK(!protocol_config_->ice_supported()); -#if defined(OS_NACL) - LOG(FATAL) << "WebRTC is not supported in webapp."; -#else // defined(OS_NACL) +#if !defined(ENABLE_WEBRTC_REMOTING_CLIENT) + LOG(FATAL) << "WebRTC is not supported."; +#else connection_.reset(new protocol::WebrtcConnectionToHost()); -#endif // !defined(OS_NACL) +#endif } else { DCHECK(protocol_config_->ice_supported()); connection_.reset(new protocol::IceConnectionToHost()); diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc index 8430afc..7d8b7f8 100644 --- a/remoting/client/jni/chromoting_jni_instance.cc +++ b/remoting/client/jni/chromoting_jni_instance.cc @@ -408,6 +408,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { protocol::NetworkSettings::NAT_TRAVERSAL_FULL), protocol::TransportRole::CLIENT); +#if defined(ENABLE_WEBRTC_REMOTING_CLIENT) if (flags_.find("useWebrtc") != std::string::npos) { VLOG(0) << "Attempting to connect using WebRTC."; scoped_ptr<protocol::CandidateSessionConfig> protocol_config = @@ -416,7 +417,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { protocol_config->set_ice_supported(false); client_->set_protocol_config(std::move(protocol_config)); } - +#endif // defined(ENABLE_WEBRTC_REMOTING_CLIENT) client_->Start(signaling_.get(), client_auth_config_, transport_context, host_jid_, capabilities_); } |