Merge pull request #488 from jianjunz/ios-m88

Fix iOS build issues after rebasing to M88.

Author: jianjunz

DEPS

@@ -33,8 +33,19 @@
 # This file contains dependencies for Intel CS for WebRTC Client SDKs.
 # It based on Chromium project.
 
+gclient_gn_args_file = 'src/build/config/gclient_args.gni'
+gclient_gn_args = [
+  'checkout_google_benchmark',
+]
+
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
+
+  # By default, do not check out Google Benchmark. The library is only used by a
+  # few specialized benchmarks that most developers do not interact with. Will
+  # be overridden by gclient variables.
+  'checkout_google_benchmark': True,
+
   # By default, we should check out everything needed to run on the main
   # chromium waterfalls. More info at: crbug.com/570091.
   'checkout_configuration': 'default',
@@ -73,7 +84,7 @@ deps = {
   'src/base':
     Var('chromium_git') + '/chromium/src/base' + '@' + 'cdccd610777e3e49936c03a35b3ef7cb7d8a6794',
   'src/build':
-    Var('chromium_git') + '/chromium/src/build' + '@' + '6b0abd7198f91211eb4b6ad65636cce6b2c0308c',
+    Var('chromium_git') + '/chromium/src/build' + '@' + '57d7d0ceaed77728665884b58d60230b13906a9c',
   'src/buildtools':
     Var('chromium_git') + '/chromium/src/buildtools' + '@' + '6302c1175607a436e18947a5abe9df2209e845fc',
   # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -211,6 +222,7 @@ deps = {
     'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@c39ab82c90479341dcf28eaa8174af6f08c0d7ae',
   'src/third_party/google_benchmark/src': {
     'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20',
+    'condition': 'checkout_google_benchmark',
   },
   'src/third_party/gtest-parallel':
     Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'b0a18bc755c25e213b60868f97b72171c3601725',
@@ -319,7 +331,7 @@ deps = {
     Var('chromium_git') + '/infra/luci/client-py.git' + '@' +  Var('swarming_revision'),
   # WebRTC-only dependencies (not present in Chromium).
   'src/third_party/webrtc':
-    Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '2619b2535ce802ac36466a5f7141e40903691ba1',
+    Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '51f552a0d00e3a25e2642582a1f0ac7373013804',
  'src/third_party/accessibility_test_framework': {
       'packages': [
           {

scripts/build.py

@@ -20,10 +20,14 @@
 import re
 import distutils.dir_util
 
+HOME_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(__file__)),'build','config','mac'))
+sys.path.append(os.path.join(HOME_PATH, 'third_party', 'webrtc','tools_webrtc','apple'))
 import sdk_info
+import copy_framework_header
+
 
-HOME_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 OUT_PATH = os.path.join(HOME_PATH, 'out')
 # The lib contains all target architectures and external libs(OpenSSL).
 OUT_LIB_NAME = 'libowt.a'
@@ -79,7 +83,11 @@ def ninjabuild(arch, scheme, targets):
 def copyheaders(headers_target_folder):
   if os.path.exists(headers_target_folder):
     shutil.rmtree(headers_target_folder)
-  shutil.copytree(HEADER_PATH, headers_target_folder)
+    os.mkdir(headers_target_folder)
+  for _, _, file_names in os.walk(HEADER_PATH):
+    for file_name in file_names:
+      copy_framework_header.process(os.path.join(
+          HEADER_PATH, file_name), os.path.join(headers_target_folder, file_name))
 
 def getexternalliblist(ssl_root):
   libs = []
@@ -147,7 +155,7 @@ def getsdkversion():
 
 # Run unit tests on simulator. Return True if all tests are passed.
 def runtest(ssl_root):
-  print 'Start running unit tests.'
+  print('Start running unit tests.')
   # Build app targets checks link issue.
   if not ninjabuild(TEST_ARCH, TEST_SCHEME, SDK_TARGETS + APP_TARGETS + TEST_TARGETS):
     return False
@@ -197,7 +205,7 @@ def main():
         return 1
     if not runtest(opts.ssl_root):
       return 1
-  print 'Done.'
+  print('Done.')
   return 0
 
 if __name__ == '__main__':

scripts/prepare_dev.py

@@ -38,6 +38,7 @@
     ('0007-Fix-examples-path-error.patch', BUILD_PATH),
     ('0008-Disable-loop-range-analysis-when-build-with-Xcode-cl.patch', BUILD_PATH),
     ('0009-Export-WebRTC-symbols-on-iOS.patch', BUILD_PATH),
+    ('0010-Restore-is_ash-for-backward-compatible.patch', BUILD_PATH),
     ('0013-Remove-unused-gni-for-av1-build.patch', THIRD_PARTY_PATH),
     ('0014-Fix-missing-ffmpeg-configure-item-for-msvc-build.patch', FFMPEG_PATH)
 ]

talk/owt/BUILD.gn

@@ -178,20 +178,13 @@ static_library("owt_sdk_base") {
       include_dirs += [ owt_quic_header_root ]
     }
   }
-  
+
   if (is_win || is_linux) {
     # Custom audio/video input and output.
     # When rebasing libwebrtc to a new version, custom audio/video input/output
     # usually need some changes to fit the latest API.
     defines += [ "OWT_CUSTOM_AVIO" ]
   }
-  if (is_ios) {
-    sources += [
-      "sdk/base/ios/networkmonitorios.cc",
-      "sdk/base/ios/networkmonitorios.h",
-    ]
-    public_deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
-  }
   if (is_win) {
     sources += [
       "sdk/base/desktopcapturer.cc",
@@ -341,9 +334,14 @@ if (is_ios) {
       ":owt_sdk_p2p",
       "//third_party/jsoncpp",
     ]
+    if (is_ios) {
+      deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
+    }
     include_dirs = [
       "//third_party",
-      "//third_party/webrtc/sdk/objc/Framework/Headers",
+      "//third_party/webrtc/sdk/objc/api/peerconnection",
+      "//third_party/webrtc/sdk/objc/api/logging",
+      "//third_party/webrtc/sdk/objc/api/video_codec",
       "sdk/include/cpp",
       "sdk/include/objc",
     ]
@@ -362,8 +360,6 @@ if (is_ios) {
       "sdk/base/objc/OWTDefaultVideoEncoderFactory.h",
       "sdk/base/objc/OWTDefaultVideoEncoderFactory.m",
       "sdk/base/objc/OWTErrors.m",
-
-      #"sdk/base/objc/OWTGlobalConfiguration.mm",
       "sdk/base/objc/OWTLocalStream+Private.h",
       "sdk/base/objc/OWTLocalStream.mm",
       "sdk/base/objc/OWTMediaFormat+Internal.h",
@@ -382,8 +378,6 @@ if (is_ios) {
       "sdk/base/objc/RemoteStreamObserverObjcImpl.mm",
       "sdk/base/objc/public/OWTErrors.h",
       "sdk/base/objc/public/OWTFrameGeneratorProtocol.h",
-
-      #"sdk/base/objc/public/OWTGlobalConfiguration.h",
       "sdk/base/objc/public/OWTLocalCameraStream.h",
       "sdk/base/objc/public/OWTLocalCameraStreamParameters.h",
       "sdk/base/objc/public/OWTLocalCustomizedStream.h",

talk/owt/patches/0005-Fixed-compile-issue-and-disable-thin-archive.patch

@@ -13,24 +13,24 @@ index 77f0e4516..cd7288683 100644
 --- a/config/c++/c++.gni
 +++ b/config/c++/c++.gni
 @@ -13,7 +13,7 @@ declare_args() {
-   use_custom_libcxx =
-       is_fuchsia || is_android || is_mac || (is_ios && !use_xcode_clang) ||
-       (is_win && is_clang) ||
--      ((is_linux || is_chromeos) &&
-+      ((is_linux && is_clang) &&
-        (!is_chromeos || default_toolchain != "//build/toolchain/cros:target"))
+   # is not supported.
+   use_custom_libcxx = is_fuchsia || is_android || is_mac ||
+                       (is_ios && !use_xcode_clang) || (is_win && is_clang) ||
+-                      ((is_linux || is_chromeos) &&
++                      ((is_linux && is_clang) &&
+                        (!is_chromeos_ash ||
+                         default_toolchain != "//build/toolchain/cros:target"))
 
-   # Use libc++ instead of stdlibc++ when using the host_cpu toolchain, even if
 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
 index 9bc7dda39..1b002fe08 100644
 --- a/config/compiler/BUILD.gn
 +++ b/config/compiler/BUILD.gn
-@@ -1764,7 +1764,7 @@ config("thin_archive") {
-   # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
-   # have a "thin archive" mode (it does accept -T, but it means truncating
-   # archive names to 16 characters, which is not what we want).
--  if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
-+  if ((is_posix && !is_nacl && !is_apple && !is_linux) || is_fuchsia) {
+@@ -1836,7 +1836,7 @@ config("export_dynamic") {
+ config("thin_archive") {
+   # The macOS and iOS default linker ld64 does not support reading thin
+   # archives.
+-  if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) {
++  if ((is_posix && !is_nacl && !is_linux && (!is_apple || use_lld)) || is_fuchsia) {
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]

talk/owt/patches/0007-Fix-examples-path-error.patch

@@ -1,25 +1,25 @@
-From 0b6bce6a68a44c1915d102d9636060d0fd4763a3 Mon Sep 17 00:00:00 2001
-From: Qiu Jainlin <jianlin.qiu@intel.com>
-Date: Thu, 7 May 2020 10:06:20 +0800
-Subject: [PATCH] Fix examples path error
+From 9c3dae0473f6d2f1011a0917436a536af7deec0c Mon Sep 17 00:00:00 2001
+From: Jianjun Zhu <jianjun.zhu@intel.com>
+Date: Sun, 14 Feb 2021 10:37:08 +0800
+Subject: [PATCH] Fix examples path error.
 
 ---
  config/linux/gtk/BUILD.gn | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config/linux/gtk/BUILD.gn b/config/linux/gtk/BUILD.gn
-index 8bfa55924..60ca70c48 100644
+index 5491aef73..6bae2dcf0 100644
 --- a/config/linux/gtk/BUILD.gn
 +++ b/config/linux/gtk/BUILD.gn
-@@ -34,7 +34,7 @@ group("gtk") {
-     "//remoting/host/file_transfer",
-     "//remoting/host:remoting_me2me_host_static",
+@@ -38,7 +38,7 @@ group("gtk") {
+     "//remoting/host/it2me:remote_assistance_host",
+     "//remoting/host/linux",
      "//remoting/test:it2me_standalone_host_main",
 -    "//webrtc/examples:peerconnection_client",
-+    "//third_party//webrtc/examples:peerconnection_client",
++    "//third_party/webrtc/examples:peerconnection_client",
    ]
 
    public_configs = [ ":gtk_internal_config" ]
 -- 
-2.24.1.windows.2
+2.30.0
 

talk/owt/patches/0010-Restore-is_ash-for-backward-compatible.patch

@@ -0,0 +1,26 @@
+From 4c01af961bd7f4111ce24cbe884d52d46d4b2956 Mon Sep 17 00:00:00 2001
+From: Jianjun Zhu <[email protected]>
+Date: Wed, 24 Feb 2021 15:06:02 +0800
+Subject: [PATCH] Restore is_ash for backward compatible.
+
+---
+ config/chromeos/ui_mode.gni | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/config/chromeos/ui_mode.gni b/config/chromeos/ui_mode.gni
+index df578bc92..12a973f84 100644
+--- a/config/chromeos/ui_mode.gni
++++ b/config/chromeos/ui_mode.gni
+@@ -31,6 +31,9 @@ declare_args() {
+ # toolchains.
+ is_chromeos_ash = is_chromeos && !chromeos_is_browser_only
+ 
++# Restore is_ash for backward compatible.
++is_ash = is_chromeos_ash
++
+ # TODO(crbug.com/1052397): Remove is_linux once lacros-chrome switches
+ # to target_os=chromeos
+ is_chromeos_lacros = (is_chromeos || is_linux) && chromeos_is_browser_only
+-- 
+2.30.1
+