Revert of Extract iOS SDK helpers to separate target.

webrtc/sdk/BUILD.gn

Index: webrtc/sdk/BUILD.gn
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 0bf5a63453514ab4da0e28360be1e26a55a30270..8c8cade1d79c02f7e65dcdb05c06b2af454585ab 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -25,21 +25,6 @@
       "objc/Framework/Classes",
       "objc/Framework/Headers",
     ]
-  }
-
-  rtc_static_library("rtc_sdk_helpers_objc") {
-    sources = [
-      "objc/Framework/Classes/helpers.h",
-      "objc/Framework/Classes/helpers.mm",
-    ]
-    deps = [
-      "../base:rtc_base_approved",
-    ]
-    configs += [ "..:common_objc" ]
-
-    if (is_ios) {
-      libs = [ "AVFoundation.framework" ]
-    }
   }
 
   rtc_static_library("rtc_sdk_common_objc") {
@@ -54,6 +39,8 @@
       "objc/Framework/Classes/RTCMetricsSampleInfo.mm",
       "objc/Framework/Classes/RTCSSLAdapter.mm",
       "objc/Framework/Classes/RTCTracing.mm",
+      "objc/Framework/Classes/helpers.h",
+      "objc/Framework/Classes/helpers.mm",
       "objc/Framework/Headers/WebRTC/RTCDispatcher.h",
       "objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
       "objc/Framework/Headers/WebRTC/RTCLogging.h",
@@ -64,7 +51,6 @@
       "objc/Framework/Headers/WebRTC/RTCTracing.h",
     ]
     deps = [
-      ":rtc_sdk_helpers_objc",
       "../base:rtc_base",
     ]
     configs += [ "..:common_objc" ]
@@ -286,7 +272,7 @@
       # gets additional generated targets which would require many lines here to
       # cover (which would be confusing to read and hard to maintain).
       if (!is_android && !is_ios) {
-        visibility = [ "../:rtc_unittests" ]
+        visibility = [ "//webrtc:rtc_unittests" ]
       }
       sources = [
         "objc/Framework/UnitTests/RTCConfigurationTest.mm",
@@ -316,9 +302,9 @@
       defines = [ "GTEST_RELATIVE_PATH" ]
       deps = [
         ":rtc_sdk_peerconnection_objc",
-        "..//system_wrappers:system_wrappers_default",
         "../base:rtc_base_tests_utils",
         "//third_party/ocmock",
+        "//webrtc/system_wrappers:system_wrappers_default",
       ]
 
       if (!build_with_chromium && is_clang) {
@@ -420,8 +406,8 @@
     complete_static_lib = true
     deps = [
       ":rtc_sdk_peerconnection_objc",
-      "..//system_wrappers:field_trial_default",
-      "..//system_wrappers:metrics_default",
+      "//webrtc/system_wrappers:field_trial_default",
+      "//webrtc/system_wrappers:metrics_default",
     ]
   }
 
@@ -435,7 +421,7 @@
       "objc/Framework/Classes/h264_video_toolbox_nalu.h",
     ]
 
-    configs += [ "../:common_objc" ]
+    configs += [ "//webrtc:common_objc" ]
 
     deps = [
       ":rtc_sdk_common_objc",