Fix WebRTC r6818 build on iOS

BearWare · Dec 10, 2024 · 2dd58ab · 2dd58ab
1 parent 37b14d1
commit 2dd58ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
@@ -220,7 +220,7 @@ else()
       )
     ExternalProject_Get_Property(depot-tools SOURCE_DIR)
     set (DEPOTTOOLS_DIR ${SOURCE_DIR})
-    set (DEPOTTOOLS_EXPORT export PATH=$ENV{PATH}:${DEPOTTOOLS_DIR} OPENSSL_DIR=${OPENSSL_DIR})
+    set (DEPOTTOOLS_EXPORT export PATH=$ENV{PATH}:${DEPOTTOOLS_DIR})
 
     if (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
       set (WEBRTC_REPO_NAME webrtc_ios)
@@ -264,7 +264,9 @@ else()
         INSTALL_DIR       ${WEBRTC_INSTALL_ROOT}
         CONFIGURE_COMMAND ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_SOURCE_ROOT} && gn gen <INSTALL_DIR>
         BUILD_COMMAND     ${DEPOTTOOLS_EXPORT} && ninja -v -C <INSTALL_DIR> teamtalk
-        INSTALL_COMMAND   cd ${WEBRTC_SOURCE_ROOT} && find . -type f -name "*.h" -or -name "*.inc" -exec ditto \{\} <INSTALL_DIR>/include/\{\} \$<SEMICOLON>
+        INSTALL_COMMAND   cd ${WEBRTC_SOURCE_ROOT} && mkdir -p <INSTALL_DIR>/include
+        COMMAND           cd ${WEBRTC_SOURCE_ROOT} && find . -type f -name "*.h" -exec ditto \{\} <INSTALL_DIR>/include/\{\} \$<SEMICOLON>
+        COMMAND           cd ${WEBRTC_SOURCE_ROOT} && find . -type f -name "*.inc" -exec ditto \{\} <INSTALL_DIR>/include/\{\} \$<SEMICOLON>
         BUILD_BYPRODUCTS  <INSTALL_DIR>/obj/modules/audio_processing/libteamtalk.a
         DEPENDS depot-tools
         )
@@ -292,7 +294,7 @@ else()
         UPDATE_COMMAND    ""
         INSTALL_DIR       ${WEBRTC_INSTALL_ROOT}-arm64
         CONFIGURE_COMMAND ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_SOURCE_ROOT} && gn gen <INSTALL_DIR>
-        BUILD_COMMAND     ninja -v -C <INSTALL_DIR> teamtalk
+        BUILD_COMMAND     ${DEPOTTOOLS_EXPORT} && ninja -v -C <INSTALL_DIR> teamtalk
         INSTALL_COMMAND   cd ${WEBRTC_SOURCE_ROOT} && find . -type f -name "*.h" -or -name "*.inc" -exec ditto \{\} <INSTALL_DIR>/include/\{\} \$<SEMICOLON>
         BUILD_BYPRODUCTS  <INSTALL_DIR>/obj/modules/audio_processing/libteamtalk.a
         DEPENDS depot-tools
@@ -305,7 +307,7 @@ else()
         UPDATE_COMMAND    ""
         INSTALL_DIR       ${WEBRTC_INSTALL_ROOT}-intel
         CONFIGURE_COMMAND ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_SOURCE_ROOT} && gn gen <INSTALL_DIR>
-        BUILD_COMMAND     ninja -v -C <INSTALL_DIR> teamtalk
+        BUILD_COMMAND     ${DEPOTTOOLS_EXPORT} && ninja -v -C <INSTALL_DIR> teamtalk
         INSTALL_COMMAND   cd ${WEBRTC_SOURCE_ROOT} && find . -type f -name "*.h" -or -name "*.inc" -exec ditto \{\} <INSTALL_DIR>/include/\{\} \$<SEMICOLON>
         BUILD_BYPRODUCTS  <INSTALL_DIR>/obj/modules/audio_processing/libteamtalk.a
         DEPENDS depot-tools

diff --git a/Library/TeamTalkLib/build/webrtc/args.gn_ios b/Library/TeamTalkLib/build/webrtc/args.gn_ios
@@ -1,11 +1,13 @@
-clang_base_path="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr"
+@WEBRTC_CFG_EXTRA@
 enable_dsyms=true
-enable_ios_bitcode=true
 gtest_enable_absl_printers=false
 ios_deployment_target="@CMAKE_OSX_DEPLOYMENT_TARGET@"
 ios_enable_code_signing=false
 is_component_build=false
 is_debug=false
+libcxx_is_shared=false
+libsrtp_build_boringssl = false
+libsrtp_ssl_root = "/dev/null"
 rtc_build_examples=false
 rtc_build_libvpx=false
 rtc_build_opus=false
@@ -15,17 +17,15 @@ rtc_disable_logging=true
 rtc_enable_protobuf=false
 rtc_enable_sctp=false
 rtc_exclude_field_trial_default=true
-rtc_include_builtin_video_codecs=false
 rtc_include_opus=false
+rtc_include_tests=false
 rtc_libvpx_build_vp9=false
-rtc_ssl_root="@OPENSSL_DIR@/include"
+rtc_ssl_root="/dev/null"
 target_cpu="@WEBRTC_ARCH@"
 target_os="ios"
 treat_warnings_as_errors=false
 use_aura=false
 use_custom_libcxx=false
+use_lld=false
 use_ozone=false
-use_rtti=true rtc_include_tests=false
-use_xcode_clang=true
-libcxx_is_shared=true
-@WEBRTC_CFG_EXTRA@
+use_rtti=true