diff --git a/submodules/TgVoipWebrtc/Impl/TgVoip.cpp b/submodules/TgVoipWebrtc/Impl/TgVoip.cpp index 466fc5291a..6983708196 100644 --- a/submodules/TgVoipWebrtc/Impl/TgVoip.cpp +++ b/submodules/TgVoipWebrtc/Impl/TgVoip.cpp @@ -31,7 +31,7 @@ void tgvoip_openssl_aes_ige_decrypt(uint8_t* in, uint8_t* out, size_t length, ui } void tgvoip_openssl_rand_bytes(uint8_t* buffer, size_t len){ - RAND_bytes(buffer, len); + RAND_bytes(buffer, (int)len); } void tgvoip_openssl_sha1(uint8_t* msg, size_t len, uint8_t* output){ diff --git a/third-party/webrtc/BUILD b/third-party/webrtc/BUILD index fd2b2e8807..03119e6e72 100644 --- a/third-party/webrtc/BUILD +++ b/third-party/webrtc/BUILD @@ -6,6 +6,8 @@ filegroup( name = "webrtc_sources", srcs = glob([ "webrtc-ios/**/*" + ], exclude = [ + "**/.git/**", ]), ) @@ -34,7 +36,7 @@ genrule( echo "Unsupported architecture $(TARGET_CPU)" fi BUILD_DIR="$(RULEDIR)/$$BUILD_ARCH" - rm -rf "$$BUILD_DIR" + #rm -rf "$$BUILD_DIR" mkdir -p "$$BUILD_DIR" SOURCE_PATH="third-party/webrtc/webrtc-ios/src" @@ -65,7 +67,7 @@ genrule( sh $$BUILD_DIR/build-webrtc-bazel.sh "$$BUILD_DIR" $$BUILD_ARCH """ + "\n".join([ - "cp -f $$BUILD_DIR/src/out/$$OUT_DIR/obj/{lib} $(location {lib})".format(lib=lib) for lib in webrtc_libs + "cp -f $$BUILD_DIR/src/out/$$OUT_DIR/obj/sdk/libframework_objc_static.a $(location {lib})".format(lib=lib) for lib in webrtc_libs ]), outs = webrtc_libs, visibility = ["//visibility:public",] diff --git a/third-party/webrtc/build-webrtc-bazel.sh b/third-party/webrtc/build-webrtc-bazel.sh index bad6eb9722..963768755e 100755 --- a/third-party/webrtc/build-webrtc-bazel.sh +++ b/third-party/webrtc/build-webrtc-bazel.sh @@ -24,6 +24,6 @@ if [ "$ARCH" == "x64" ]; then fi gn gen out/$OUT_DIR --args="use_xcode_clang=true "" target_cpu=\"$ARCH\""' target_os="ios" is_debug=false is_component_build=false rtc_include_tests=false use_rtti=true rtc_use_x11=false use_custom_libcxx=false use_custom_libcxx_for_host=false rtc_include_builtin_video_codecs=false rtc_build_ssl=false rtc_build_examples=false rtc_build_tools=false ios_deployment_target="9.0" ios_enable_code_signing=false is_unsafe_developer_build=false rtc_enable_protobuf=false rtc_include_builtin_video_codecs=false rtc_use_gtk=false rtc_use_metal_rendering=false rtc_ssl_root="//openssl"' -ninja -C out/$OUT_DIR webrtc +ninja -C out/$OUT_DIR framework_objc_static popd diff --git a/third-party/webrtc/webrtc-ios b/third-party/webrtc/webrtc-ios index 8f607fdd69..625c777c8a 160000 --- a/third-party/webrtc/webrtc-ios +++ b/third-party/webrtc/webrtc-ios @@ -1 +1 @@ -Subproject commit 8f607fdd6930223d8db1c8f0496c4cd3ab83be9a +Subproject commit 625c777c8ad260cbc4bf9a6409d5b4382d92914b