Revert of Extract iOS SDK helpers to separate target.

webrtc/sdk/BUILD.gn

 # Copyright 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../webrtc.gni")
 if (is_ios) {
   import("//build/config/ios/rules.gni")
 }
 
 group("sdk") {
   if (is_ios) {
     public_deps = [
       ":rtc_sdk_framework_objc",
     ]
   }
 }
 
 if (is_ios || is_mac) {
   config("rtc_sdk_common_objc_config") {
     include_dirs = [
       "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") {
     sources = [
       "objc/Framework/Classes/NSString+StdString.h",
       "objc/Framework/Classes/NSString+StdString.mm",
       "objc/Framework/Classes/RTCDispatcher.m",
       "objc/Framework/Classes/RTCFieldTrials.mm",
       "objc/Framework/Classes/RTCLogging.mm",
       "objc/Framework/Classes/RTCMetrics.mm",
       "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h",
       "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",
       "objc/Framework/Headers/WebRTC/RTCMacros.h",
       "objc/Framework/Headers/WebRTC/RTCMetrics.h",
       "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
       "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
       "objc/Framework/Headers/WebRTC/RTCTracing.h",
     ]
     deps = [
-      ":rtc_sdk_helpers_objc",
       "../base:rtc_base",
     ]
     configs += [ "..:common_objc" ]
 
     public_configs = [ ":rtc_sdk_common_objc_config" ]
     if (is_ios) {
       sources += [
         "objc/Framework/Classes/RTCCameraPreviewView.m",
         "objc/Framework/Classes/RTCUIApplication.h",
         "objc/Framework/Classes/RTCUIApplication.mm",
@@ skipping 201 matching lines @@
   }
 
   if (rtc_include_tests) {
     rtc_source_set("rtc_sdk_peerconnection_objc_unittests") {
       testonly = true
 
       # Skip restricting visibility on mobile platforms since the tests on those
       # 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",
         "objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm",
         "objc/Framework/UnitTests/RTCIceCandidateTest.mm",
         "objc/Framework/UnitTests/RTCIceServerTest.mm",
         "objc/Framework/UnitTests/RTCMediaConstraintsTest.mm",
         "objc/Framework/UnitTests/RTCPeerConnectionTest.mm",
         "objc/Framework/UnitTests/RTCSessionDescriptionTest.mm",
         "objc/Framework/UnitTests/avformatmappertests.mm",
       ]
       if (is_ios) {
         sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ]
         if (current_cpu != "arm64") {
           sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
         }
       }
 
       # TODO(tkchin): Cleanup this warning.
       cflags = [ "-Wno-objc-property-no-attribute" ]
 
       # |-ObjC| flag needed to make sure category method implementations
       # are included:
       # https://developer.apple.com/library/mac/qa/qa1490/_index.html
       ldflags = [ "-ObjC" ]
 
       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) {
         # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
         suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
       }
     }
   }
 
   if (is_ios) {
@@ skipping 81 matching lines @@
         # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
         configs -= [ "//build/config/clang:find_bad_constructs" ]
       }
     }
   }
 
   rtc_static_library("rtc_sdk_objc") {
     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",
     ]
   }
 
   rtc_static_library("webrtc_h264_video_toolbox") {
     sources = [
       "objc/Framework/Classes/h264_video_toolbox_decoder.cc",
       "objc/Framework/Classes/h264_video_toolbox_decoder.h",
       "objc/Framework/Classes/h264_video_toolbox_encoder.h",
       "objc/Framework/Classes/h264_video_toolbox_encoder.mm",
       "objc/Framework/Classes/h264_video_toolbox_nalu.cc",
       "objc/Framework/Classes/h264_video_toolbox_nalu.h",
     ]
 
-    configs += [ "../:common_objc" ]
+    configs += [ "//webrtc:common_objc" ]
 
     deps = [
       ":rtc_sdk_common_objc",
       "../api:video_frame_api",
       "../base:rtc_base_approved",
       "../common_video",
       "../media:rtc_media_base",
       "../modules:module_api",
       "../modules/video_coding:video_coding_utility",
       "../modules/video_coding:webrtc_h264",
@@ skipping 16 matching lines @@
       deps += [ "$rtc_libyuv_dir" ]
       public_deps = [
         "$rtc_libyuv_dir",
       ]
     } else {
       # Need to add a directory normally exported by libyuv.
       include_dirs = [ "$rtc_libyuv_dir/include" ]
     }
   }
 }