diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index f41501e7f8..198b67d520 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -14,6 +14,14 @@ config("audio_device_config") {
     "include",
     "dummy",  # Contains dummy audio device implementations.
   ]
+  if (is_ios) {
+    # GN orders flags on a target before flags from configs. In order to be able
+    # suppress the -Wthread-safety-analysis warning, it has come from a config
+    # and can't be on the target directly.
+    # TODO(tkchin): Remove after fixing
+    # https://bugs.chromium.org/p/webrtc/issues/detail?id=5748
+    cflags = [ "-Wno-thread-safety-analysis" ]
+  }
 }
 
 source_set("audio_device") {
@@ -148,6 +156,7 @@ source_set("audio_device") {
         "ios/voice_processing_audio_unit.mm",
       ]
       cflags += [ "-fobjc-arc" ]  # CLANG_ENABLE_OBJC_ARC = YES.
+
       libs = [
         "AudioToolbox.framework",
         "AVFoundation.framework",
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 54694b8b64..af9516f434 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -59,6 +59,7 @@ source_set("test_support") {
     "testsupport/frame_reader.h",
     "testsupport/frame_writer.cc",
     "testsupport/frame_writer.h",
+    "testsupport/iosfileutils.mm",
     "testsupport/mock/mock_frame_reader.h",
     "testsupport/mock/mock_frame_writer.h",
     "testsupport/packet_reader.cc",
@@ -76,6 +77,10 @@ source_set("test_support") {
     "//testing/gtest",
   ]
 
+  if (is_ios) {
+    cflags = [ "-fobjc-arc" ]  # CLANG_ENABLE_OBJC_ARC = YES.
+  }
+
   if (is_android) {
     deps += [ "//base:base" ]
   }