diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
---|---|---|
committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /sdk/android/src/jni/android_network_monitor.cc | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'sdk/android/src/jni/android_network_monitor.cc')
-rw-r--r-- | sdk/android/src/jni/android_network_monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc index fa82816431..686f94e1e6 100644 --- a/sdk/android/src/jni/android_network_monitor.cc +++ b/sdk/android/src/jni/android_network_monitor.cc @@ -247,7 +247,7 @@ void AndroidNetworkMonitor::Start() { webrtc::field_trial::IsEnabled( "WebRTC-FindNetworkHandleWithoutIpv6TemporaryPart"); bind_using_ifname_ = - webrtc::field_trial::IsEnabled("WebRTC-BindUsingInterfaceName"); + !webrtc::field_trial::IsDisabled("WebRTC-BindUsingInterfaceName"); // This pointer is also accessed by the methods called from java threads. // Assigning it here is safe, because the java monitor is in a stopped state, |