Move things around a bit

Telegram/BUILD

@@ -1783,6 +1783,7 @@ ios_application(
         #"//submodules/TelegramCore",
         #"//submodules/FFMpegBinding",
         "//third-party/webrtc",
+        "//third-party/webrtc:webrtc_objc",
         #"//submodules/AsyncDisplayKit",
         #"//submodules/ObjCRuntimeUtils",
     ],
@@ -1815,7 +1816,8 @@ ios_application(
         ":UrlTypesInfoPlist",
     ],
     deps = [
-        "//third-party/webrtc:webrtc",
+        "//third-party/webrtc",
+        "//third-party/webrtc:webrtc_objc",
     ],
 )
 

submodules/TgVoipWebrtc/BUILD

@@ -152,6 +152,7 @@ objc_library(
         "-Ithird-party/libyuv/third_party/libyuv/include",
         "-Ithird-party/libyuv",
         "-Ithird-party/webrtc/webrtc/sdk/objc/api/video_codec",
+        "-Ithird-party/webrtc/absl/third_party/abseil-cpp",
         "-DWEBRTC_IOS",
         "-DWEBRTC_MAC",
         "-DWEBRTC_POSIX",
@@ -163,7 +164,8 @@ objc_library(
         "PublicHeaders",
     ],
     deps = [
-        "//third-party/webrtc:webrtc",
+        "//third-party/webrtc",
+        "//third-party/webrtc:webrtc_objc",
         "//submodules/MtProtoKit:MtProtoKit",
         "//third-party/boringssl:crypto",
         "//third-party/boringssl:ssl",
@@ -171,7 +173,7 @@ objc_library(
         "//third-party/opusfile:opusfile",
         "//submodules/ffmpeg:ffmpeg",
         "//third-party/rnnoise:rnnoise",
-        "//third-party/libyuv:libyuv",
+        "//third-party/libyuv",
         "//third-party/td:TdBinding",
     ] + (["//third-party/libx264:libx264"] if enable_x264 else []),
     sdk_frameworks = [

third-party/boringssl/BUILD

@@ -132,6 +132,37 @@ boringssl_copts_cxx = boringssl_copts + select({
     "//conditions:default": gcc_copts_cxx,
 })
 
+# Some build tools don't support multiple targets declaring the same headers directory
+
+genrule(
+    name = "copy_ssl_headers",
+    srcs = ssl_headers,
+    cmd_bash = 
+    """
+    set -ex
+    """ + "\n".join([
+        "cp $(location {}) $(location :ssl_headers/{})".format(x, x)
+        for x in ssl_headers
+    ]),
+    outs = [
+        ":ssl_headers/{}".format(x) for x in ssl_headers
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
+
+cc_library(
+    name = "ssl_headers",
+    srcs = [],
+    hdrs = [
+        ":ssl_headers/{}".format(x) for x in ssl_headers
+    ],
+    includes = [
+        "ssl_headers/src/include",
+    ],
+)
+
 cc_library(
     name = "crypto",
     srcs = crypto_sources + crypto_internal_headers + asm_sources,
@@ -149,12 +180,11 @@ cc_library(
 cc_library(
     name = "ssl",
     srcs = ssl_sources + ssl_internal_headers,
-    hdrs = ssl_headers,
     copts = boringssl_copts_cxx,
-    includes = ["src/include"],
     visibility = ["//visibility:public"],
     deps = [
         ":crypto",
+        ":ssl_headers",
     ],
 )
 

third-party/openh264/BUILD

@@ -248,6 +248,7 @@ cc_library(
     ],
     textual_hdrs = arch_specific_textual_hdrs,
     includes = [
+        "."
     ],
     copts = arch_specific_copts + [
         "-Ithird-party/openh264/third_party/openh264/src/codec/encoder/core/inc",

third-party/webrtc/absl/BUILD

@@ -0,0 +1,367 @@
+absl_sources = [ "third_party/abseil-cpp/" + x for x in [
+    "absl/container/internal/layout.h",
+    "absl/container/internal/hashtable_debug_hooks.h",
+    "absl/strings/internal/cord_internal.h",
+    "absl/strings/internal/cord_rep_btree.h",
+    "absl/strings/internal/cord_rep_flat.h",
+    "absl/strings/internal/cord_rep_btree_reader.h",
+    "absl/strings/internal/cord_rep_btree_navigator.h",
+    "absl/strings/internal/cordz_functions.h",
+    "absl/strings/internal/cordz_info.h",
+    "absl/strings/internal/cordz_handle.h",
+    "absl/strings/internal/cordz_statistics.h",
+    "absl/strings/internal/cordz_update_tracker.h",
+    "absl/strings/internal/cordz_update_scope.h",
+    "absl/strings/internal/string_constant.h",
+    "absl/base/internal/inline_variable.h",
+    "absl/base/internal/cycleclock.cc",
+    "absl/base/internal/low_level_alloc.cc",
+    "absl/base/internal/raw_logging.cc",
+    "absl/base/internal/scoped_set_env.cc",
+    "absl/base/internal/spinlock.cc",
+    "absl/base/internal/spinlock_wait.cc",
+    "absl/base/internal/strerror.cc",
+    "absl/base/internal/sysinfo.cc",
+    "absl/base/internal/thread_identity.cc",
+    "absl/base/internal/throw_delegate.cc",
+    "absl/base/internal/unscaledcycleclock.cc",
+    "absl/base/log_severity.cc",
+    "absl/base/config.h",
+    "absl/container/internal/hash_generator_testing.cc",
+    "absl/container/internal/hashtablez_sampler.cc",
+    "absl/container/internal/hashtablez_sampler_force_weak_definition.cc",
+    "absl/container/internal/raw_hash_set.cc",
+    "absl/container/internal/test_instance_tracker.cc",
+    "absl/debugging/failure_signal_handler.cc",
+    "absl/debugging/internal/address_is_readable.cc",
+    "absl/debugging/internal/demangle.cc",
+    "absl/debugging/internal/elf_mem_image.cc",
+    "absl/debugging/internal/examine_stack.cc",
+    "absl/debugging/internal/stack_consumption.cc",
+    "absl/debugging/internal/vdso_support.cc",
+    "absl/debugging/stacktrace.cc",
+    "absl/debugging/symbolize.cc",
+    "absl/flags/flag_test_defs.cc",
+    "absl/flags/internal/commandlineflag.cc",
+    "absl/flags/internal/flag.cc",
+    "absl/flags/internal/program_name.cc",
+    "absl/flags/internal/usage.cc",
+    "absl/flags/marshalling.cc",
+    "absl/flags/parse.cc",
+    "absl/flags/usage.cc",
+    "absl/flags/usage_config.cc",
+    "absl/hash/internal/city.cc",
+    "absl/hash/internal/hash.cc",
+    "absl/numeric/int128.cc",
+    "absl/random/discrete_distribution.cc",
+    "absl/random/gaussian_distribution.cc",
+    "absl/random/internal/chi_square.cc",
+    "absl/random/internal/distribution_test_util.cc",
+    "absl/random/internal/nanobenchmark.cc",
+    "absl/random/internal/pool_urbg.cc",
+    "absl/random/internal/randen.cc",
+    "absl/random/internal/randen_detect.cc",
+    "absl/random/internal/randen_hwaes.cc",
+    "absl/random/internal/randen_slow.cc",
+    "absl/random/internal/seed_material.cc",
+    "absl/random/seed_gen_exception.cc",
+    "absl/random/seed_sequences.cc",
+    "absl/status/status.cc",
+    "absl/status/status_payload_printer.cc",
+    "absl/strings/ascii.cc",
+    "absl/strings/charconv.cc",
+    "absl/strings/cord.cc",
+    "absl/strings/escaping.cc",
+    "absl/strings/internal/charconv_bigint.cc",
+    "absl/strings/internal/charconv_parse.cc",
+    "absl/strings/internal/escaping.cc",
+    "absl/strings/internal/memutil.cc",
+    "absl/strings/internal/ostringstream.cc",
+    "absl/strings/internal/pow10_helper.cc",
+    "absl/strings/internal/str_format/arg.cc",
+    "absl/strings/internal/str_format/bind.cc",
+    "absl/strings/internal/str_format/extension.cc",
+    "absl/strings/internal/str_format/float_conversion.cc",
+    "absl/strings/internal/str_format/output.cc",
+    "absl/strings/internal/str_format/parser.cc",
+    "absl/strings/internal/utf8.cc",
+    "absl/strings/match.cc",
+    "absl/strings/numbers.cc",
+    "absl/strings/str_cat.cc",
+    "absl/strings/str_replace.cc",
+    "absl/strings/str_split.cc",
+    "absl/strings/string_view.cc",
+    "absl/strings/substitute.cc",
+    "absl/synchronization/mutex.h",
+    "absl/synchronization/barrier.cc",
+    "absl/synchronization/blocking_counter.cc",
+    "absl/synchronization/internal/create_thread_identity.cc",
+    "absl/synchronization/internal/graphcycles.cc",
+    "absl/synchronization/internal/per_thread_sem.cc",
+    "absl/synchronization/notification.cc",
+    "absl/time/civil_time.cc",
+    "absl/time/clock.cc",
+    "absl/time/duration.cc",
+    "absl/time/format.cc",
+    "absl/time/internal/cctz/src/civil_time_detail.cc",
+    "absl/time/internal/cctz/src/time_zone_fixed.cc",
+    "absl/time/internal/cctz/src/time_zone_fixed.h",
+    "absl/time/internal/cctz/src/time_zone_format.cc",
+    "absl/time/internal/cctz/src/time_zone_if.cc",
+    "absl/time/internal/cctz/src/time_zone_if.h",
+    "absl/time/internal/cctz/src/time_zone_impl.cc",
+    "absl/time/internal/cctz/src/time_zone_impl.h",
+    "absl/time/internal/cctz/src/time_zone_info.cc",
+    "absl/time/internal/cctz/src/time_zone_info.h",
+    "absl/time/internal/cctz/src/time_zone_libc.cc",
+    "absl/time/internal/cctz/src/time_zone_libc.h",
+    "absl/time/internal/cctz/src/time_zone_lookup.cc",
+    "absl/time/internal/cctz/src/time_zone_posix.cc",
+    "absl/time/internal/cctz/src/time_zone_posix.h",
+    "absl/time/internal/cctz/src/zone_info_source.cc",
+    "absl/time/internal/cctz/src/tzfile.h",
+    "absl/time/internal/test_util.cc",
+    "absl/time/time.cc",
+    "absl/types/bad_any_cast.cc",
+    "absl/types/bad_optional_access.cc",
+    "absl/types/bad_variant_access.cc",
+    "absl/meta/type_traits.h",
+    "absl/base/options.h",
+    "absl/base/policy_checks.h",
+    "absl/strings/string_view.h",
+    "absl/base/internal/throw_delegate.h",
+    "absl/base/macros.h",
+    "absl/base/attributes.h",
+    "absl/base/optimization.h",
+    "absl/base/port.h",
+    "absl/types/optional.h",
+    "absl/types/bad_variant_access.h",
+    "absl/types/bad_any_cast.h",
+    "absl/time/internal/test_util.h",
+    "absl/time/internal/cctz/include/cctz/time_zone.h",
+    "absl/synchronization/notification.h",
+    "absl/time/internal/cctz/include/cctz/civil_time_detail.h",
+    "absl/base/casts.h",
+    "absl/time/civil_time.h",
+    "absl/synchronization/blocking_counter.h",
+    "absl/synchronization/barrier.h",
+    "absl/base/internal/low_level_alloc.h",
+    "absl/strings/str_replace.h",
+    "absl/strings/substitute.h",
+    "absl/strings/internal/utf8.h",
+    "absl/strings/numbers.h",
+    "absl/strings/internal/str_format/output.h",
+    "absl/strings/str_cat.h",
+    "absl/strings/internal/ostringstream.h",
+    "absl/strings/internal/escaping.h",
+    "absl/strings/internal/pow10_helper.h",
+    "absl/strings/internal/memutil.h",
+    "absl/strings/internal/str_format/arg.h",
+    "absl/strings/internal/str_format/extension.h",
+    "absl/strings/internal/str_format/bind.h",
+    "absl/strings/ascii.h",
+    "absl/strings/internal/charconv_bigint.h",
+    "absl/strings/escaping.h",
+    "absl/status/status.h",
+    "absl/status/internal/status_internal.h",
+    "absl/strings/cord.h",
+    "absl/random/internal/randen_slow.h",
+    "absl/random/internal/randen_detect.h",
+    "absl/random/seed_gen_exception.h",
+    "absl/random/internal/seed_material.h",
+    "absl/random/gaussian_distribution.h",
+    "absl/random/internal/chi_square.h",
+    "absl/random/internal/pool_urbg.h",
+    "absl/random/internal/distribution_test_util.h",
+    "absl/flags/usage.h",
+    "absl/flags/commandlineflag.h",
+    "absl/flags/internal/sequence_lock.h",
+    "absl/flags/internal/private_handle_accessor.h",
+    "absl/flags/reflection.h",
+    "absl/numeric/int128.h",
+    "absl/numeric/bits.h",
+    "absl/numeric/internal/bits.h",
+    "absl/numeric/internal/representation.h",
+    "absl/flags/marshalling.h",
+    "absl/flags/parse.h",
+    "absl/flags/internal/commandlineflag.h",
+    "absl/flags/internal/program_name.h",
+    "absl/flags/internal/usage.h",
+    "absl/flags/internal/registry.h",
+    "absl/debugging/internal/vdso_support.h",
+    "absl/debugging/stacktrace.h",
+    "absl/flags/flag.h",
+    "absl/debugging/internal/elf_mem_image.h",
+    "absl/debugging/internal/examine_stack.h",
+    "absl/debugging/internal/demangle.h",
+    "absl/container/internal/test_instance_tracker.h",
+    "absl/debugging/internal/address_is_readable.h",
+    "absl/container/internal/raw_hash_set.h",
+    "absl/debugging/failure_signal_handler.h",
+    "absl/container/internal/hash_generator_testing.h",
+    "absl/container/flat_hash_map.h",
+    "absl/container/internal/hash_function_defaults.h",
+    "absl/base/internal/spinlock_wait.h",
+    "absl/base/log_severity.h",
+    "absl/base/internal/sysinfo.h",
+    "absl/base/internal/scoped_set_env.h",
+    "absl/base/internal/spinlock.h",
+    "absl/base/internal/raw_logging.h",
+    "absl/base/dynamic_annotations.h",
+    "absl/strings/match.h",
+    "absl/algorithm/container.h",
+    "absl/types/bad_optional_access.h",
+    "absl/time/internal/cctz/include/cctz/zone_info_source.h",
+    "absl/time/time.h",
+    "absl/time/clock.h",
+    "absl/synchronization/internal/futex.h",
+    "absl/synchronization/internal/waiter.h",
+    "absl/strings/str_split.h",
+    "absl/strings/internal/str_format/float_conversion.h",
+    "absl/strings/internal/charconv_parse.h",
+    "absl/strings/internal/str_format/parser.h",
+    "absl/status/status_payload_printer.h",
+    "absl/random/seed_sequences.h",
+    "absl/strings/charconv.h",
+    "absl/random/internal/randen.h",
+    "absl/random/discrete_distribution.h",
+    "absl/random/internal/randen_hwaes.h",
+    "absl/hash/internal/hash.h",
+    "absl/random/internal/nanobenchmark.h",
+    "absl/hash/internal/city.h",
+    "absl/hash/internal/low_level_hash.h",
+    "absl/debugging/symbolize.h",
+    "absl/debugging/internal/stack_consumption.h",
+    "absl/flags/internal/flag.h",
+    "absl/container/internal/hashtablez_sampler.h",
+    "absl/container/internal/raw_hash_map.h",
+    "absl/profiling/internal/sample_recorder.h",
+    "absl/base/internal/unscaledcycleclock.h",
+    "absl/base/internal/thread_identity.h",
+    "absl/base/internal/cycleclock.h",
+    "absl/base/internal/strerror.h",
+    "absl/flags/usage_config.h",
+    "absl/utility/utility.h",
+    "absl/algorithm/algorithm.h",
+    "absl/base/call_once.h",
+    "absl/base/const_init.h",
+    "absl/base/internal/atomic_hook.h",
+    "absl/base/internal/endian.h",
+    "absl/base/internal/errno_saver.h",
+    "absl/base/internal/fast_type_id.h",
+    "absl/base/internal/identity.h",
+    "absl/base/internal/low_level_scheduling.h",
+    "absl/base/internal/per_thread_tls.h",
+    "absl/base/thread_annotations.h",
+    "absl/container/inlined_vector.h",
+    "absl/container/internal/hash_policy_testing.h",
+    "absl/debugging/internal/stacktrace_config.h",
+    "absl/debugging/internal/symbolize.h",
+    "absl/flags/declare.h",
+    "absl/flags/internal/parse.h",
+    "absl/memory/memory.h",
+    "absl/numeric/int128_have_intrinsic.inc",
+    "absl/random/bernoulli_distribution.h",
+    "absl/random/internal/fast_uniform_bits.h",
+    "absl/random/internal/platform.h",
+    "absl/random/internal/salted_seed_seq.h",
+    "absl/random/internal/traits.h",
+    "absl/strings/internal/str_format/checker.h",
+    "absl/strings/str_join.h",
+    "absl/synchronization/internal/graphcycles.h",
+    "absl/time/internal/cctz/include/cctz/civil_time.h",
+    "absl/types/compare.h",
+    "absl/types/span.h",
+    "absl/base/internal/invoke.h",
+    "absl/base/internal/hide_ptr.h",
+    "absl/base/internal/scheduling_mode.h",
+    "absl/base/internal/tsan_mutex_interface.h",
+    "absl/base/internal/unaligned_access.h",
+    "absl/container/internal/inlined_vector.h",
+    "absl/debugging/internal/stacktrace_unimplemented-inl.inc",
+    "absl/debugging/internal/stacktrace_generic-inl.inc",
+    "absl/debugging/symbolize_unimplemented.inc",
+    "absl/debugging/symbolize_darwin.inc",
+    "absl/flags/config.h",
+    "absl/flags/internal/path_util.h",
+    "absl/hash/hash.h",
+    "absl/random/internal/generate_real.h",
+    "absl/random/internal/iostream_state_saver.h",
+    "absl/random/internal/randen_engine.h",
+    "absl/random/internal/randen_traits.h",
+    "absl/strings/internal/resize_uninitialized.h",
+    "absl/strings/internal/str_join_internal.h",
+    "absl/strings/internal/str_split_internal.h",
+    "absl/strings/str_format.h",
+    "absl/synchronization/internal/kernel_timeout.h",
+    "absl/synchronization/internal/per_thread_sem.h",
+    "absl/types/internal/optional.h",
+    "absl/types/internal/span.h",
+    "absl/types/variant.h",
+    "absl/types/internal/variant.h",
+    "absl/base/internal/direct_mmap.h",
+    "absl/base/internal/spinlock_posix.inc",
+    "absl/base/internal/dynamic_annotations.h",
+    "absl/container/fixed_array.h",
+    "absl/container/internal/common.h",
+    "absl/container/internal/compressed_tuple.h",
+    "absl/random/internal/fastmath.h",
+    "absl/random/uniform_int_distribution.h",
+    "absl/strings/strip.h",
+    "absl/synchronization/internal/create_thread_identity.h",
+    "absl/time/internal/get_current_time_chrono.inc",
+    "absl/container/internal/container_memory.h",
+    "absl/functional/function_ref.h",
+    "absl/random/internal/wide_multiply.h",
+    "absl/container/internal/hash_policy_traits.h",
+    "absl/functional/internal/function_ref.h",
+    "absl/functional/bind_front.h",
+    "absl/functional/internal/front_binder.h",
+    "absl/base/internal/cycleclock_config.h",
+    "absl/base/internal/unscaledcycleclock_config.h",
+    "absl/functional/any_invocable.h",
+    "absl/profiling/internal/exponential_biased.h",
+    "absl/strings/cord_analysis.h",
+    "absl/strings/internal/has_absl_stringify.h",
+    "absl/container/internal/common_policy_traits.h",
+    "absl/functional/internal/any_invocable.h",
+    "absl/strings/cord_buffer.h",
+    "absl/strings/internal/stringify_sink.h",
+    "absl/cleanup/cleanup.h",
+    "absl/strings/internal/cord_data_edge.h",
+    "absl/cleanup/internal/cleanup.h",
+    "absl/strings/internal/cord_rep_crc.h",
+    "absl/base/nullability.h",
+    "absl/strings/has_absl_stringify.h",
+    "absl/synchronization/internal/futex_waiter.h",
+    "absl/base/internal/nullability_impl.h",
+    "absl/strings/internal/str_format/constexpr_parser.h",
+    "absl/synchronization/internal/waiter_base.h",
+    "absl/synchronization/internal/pthread_waiter.h",
+    "absl/base/no_destructor.h",
+    "absl/base/prefetch.h",
+    "absl/crc/internal/crc_cord_state.h",
+    "absl/strings/charset.h",
+    "absl/synchronization/internal/sem_waiter.h",
+    "absl/crc/crc32c.h",
+    "absl/synchronization/internal/stdcpp_waiter.h",
+    "absl/crc/internal/crc32c_inline.h",
+    "absl/synchronization/internal/win32_waiter.h",
+    "absl/crc/internal/crc32_x86_arm_combined_simd.h",
+    "absl/strings/internal/damerau_levenshtein_distance.h",
+]]
+
+cc_library(
+    name = "absl",
+    srcs = absl_sources,
+    cxxopts = [
+        "-std=c++17",
+    ],
+    deps = [
+    ],
+    copts = [
+        "-Ithird-party/webrtc/absl/third_party/abseil-cpp",
+        "-DABSL_ALLOCATOR_NOTHROW=1",
+    ],
+    visibility = ["//visibility:public"],
+)