github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios into mac-video-calls-temp

Browse source 
# Conflicts:
#	submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
#	submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
This commit is contained in:
overtake 2020-08-24 13:26:29 +03:00
commit 287e37850c
62 changed files with 3136 additions and 3021 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third-party/webrtc/BUILD vendored
View file

@ -1,3 +1,5 @@
use_gn_build = True
webrtc_libs = [
"libwebrtc.a",
]
@ -70,7 +72,7 @@ genrule(
)
cc_library(
name = "webrtc_lib_gn",
name = "webrtc_lib_gn" if not use_gn_build else "webrtc_lib",
srcs = [":" + x for x in webrtc_libs],
visibility = ["//visibility:public"],
)
@ -2182,7 +2184,7 @@ objc_library(
)
objc_library(
name = "webrtc_lib",
name = "webrtc_lib_custom" if use_gn_build else "webrtc_lib",
enable_modules = True,
module_name = "webrtc",
srcs = combined_sources,