| Index: webrtc/base/physicalsocketserver_unittest.cc
|
| diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
|
| index 6c7be9f63c624c04e9734fd9f8410fbf8c473932..f2eabcd66cf15f6b0f2f23d6a2b3d1978aaaa876 100644
|
| --- a/webrtc/base/physicalsocketserver_unittest.cc
|
| +++ b/webrtc/base/physicalsocketserver_unittest.cc
|
| @@ -215,8 +215,9 @@ TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) {
|
| // https://code.google.com/p/webrtc/issues/detail?id=4958
|
| // TODO(deadbeef): Enable again once test is reimplemented to be unflaky.
|
| // Also disable for ASan.
|
| +// Disabled on Android: https://code.google.com/p/webrtc/issues/detail?id=4364
|
| #if defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || \
|
| - defined(ADDRESS_SANITIZER)
|
| + defined(ADDRESS_SANITIZER) || defined(WEBRTC_ANDROID)
|
| #define MAYBE_TestUdpReadyToSendIPv4 DISABLED_TestUdpReadyToSendIPv4
|
| #else
|
| #define MAYBE_TestUdpReadyToSendIPv4 TestUdpReadyToSendIPv4
|
|
|