This commit is contained in:
Ali 2023-09-18 18:59:50 +02:00
parent 1c960c816f
commit 7e9b2b39ee
7 changed files with 7 additions and 24 deletions

View File

@ -1,15 +1,13 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
'''http_archive( http_archive(
name = "com_google_protobuf", name = "bazel_features",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v22.2/protobuf-22.2.zip"], sha256 = "9fcb3d7cbe908772462aaa52f02b857a225910d30daa3c252f670e3af6d8036d",
sha256 = "bf1f92aebd619651220711e97b3d560cdc2484718cd56d95161bfb2fadb8628e", strip_prefix = "bazel_features-1.0.0",
strip_prefix = "protobuf-22.2", url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.0.0/bazel_features-v1.0.0.tar.gz",
type = "zip",
) )
load("@bazel_features//:deps.bzl", "bazel_features_deps")
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") bazel_features_deps()
protobuf_deps()'''
local_repository( local_repository(
name = "build_bazel_rules_apple", name = "build_bazel_rules_apple",

View File

@ -341,7 +341,6 @@ swift_library(
"//submodules/TelegramUI/Components/Chat/ForwardAccessoryPanelNode", "//submodules/TelegramUI/Components/Chat/ForwardAccessoryPanelNode",
"//submodules/TelegramUI/Components/LegacyMessageInputPanel", "//submodules/TelegramUI/Components/LegacyMessageInputPanel",
] + select({ ] + select({
"@build_bazel_rules_apple//apple:ios_armv7": [],
"@build_bazel_rules_apple//apple:ios_arm64": appcenter_targets, "@build_bazel_rules_apple//apple:ios_arm64": appcenter_targets,
"//build-system:ios_sim_arm64": [], "//build-system:ios_sim_arm64": [],
"@build_bazel_rules_apple//apple:ios_x86_64": [], "@build_bazel_rules_apple//apple:ios_x86_64": [],

View File

@ -56,7 +56,6 @@ objc_library(
"-Drtc=rtc1", "-Drtc=rtc1",
"-Dwebrtc=webrtc1", "-Dwebrtc=webrtc1",
] + select({ ] + select({
"@build_bazel_rules_apple//apple:ios_armv7": copts_arm,
"@build_bazel_rules_apple//apple:ios_arm64": copts_arm, "@build_bazel_rules_apple//apple:ios_arm64": copts_arm,
"//build-system:ios_sim_arm64": copts_arm, "//build-system:ios_sim_arm64": copts_arm,
"@build_bazel_rules_apple//apple:ios_x86_64": copts_x86, "@build_bazel_rules_apple//apple:ios_x86_64": copts_x86,

View File

@ -60,14 +60,12 @@ posix_copts = [
] ]
boringssl_copts = select({ boringssl_copts = select({
"@build_bazel_rules_apple//apple:ios_armv7": posix_copts,
"@build_bazel_rules_apple//apple:ios_arm64": posix_copts, "@build_bazel_rules_apple//apple:ios_arm64": posix_copts,
"//build-system:ios_sim_arm64": posix_copts, "//build-system:ios_sim_arm64": posix_copts,
"@build_bazel_rules_apple//apple:ios_x86_64": posix_copts, "@build_bazel_rules_apple//apple:ios_x86_64": posix_copts,
}) })
crypto_sources_asm = select({ crypto_sources_asm = select({
"@build_bazel_rules_apple//apple:ios_armv7": crypto_sources_ios_arm,
"@build_bazel_rules_apple//apple:ios_arm64": crypto_sources_ios_aarch64, "@build_bazel_rules_apple//apple:ios_arm64": crypto_sources_ios_aarch64,
"//build-system:ios_sim_arm64": crypto_sources_ios_aarch64, "//build-system:ios_sim_arm64": crypto_sources_ios_aarch64,
"@build_bazel_rules_apple//apple:ios_x86_64": crypto_sources_mac_x86_64, "@build_bazel_rules_apple//apple:ios_x86_64": crypto_sources_mac_x86_64,
@ -82,7 +80,6 @@ posix_copts_c11 = [
] ]
boringssl_copts_c11 = boringssl_copts + select({ boringssl_copts_c11 = boringssl_copts + select({
"@build_bazel_rules_apple//apple:ios_armv7": posix_copts_c11,
"@build_bazel_rules_apple//apple:ios_arm64": posix_copts_c11, "@build_bazel_rules_apple//apple:ios_arm64": posix_copts_c11,
"//build-system:ios_sim_arm64": posix_copts_c11, "//build-system:ios_sim_arm64": posix_copts_c11,
"@build_bazel_rules_apple//apple:ios_x86_64": posix_copts_c11, "@build_bazel_rules_apple//apple:ios_x86_64": posix_copts_c11,
@ -95,7 +92,6 @@ posix_copts_cxx = [
] ]
boringssl_copts_cxx = boringssl_copts + select({ boringssl_copts_cxx = boringssl_copts + select({
"@build_bazel_rules_apple//apple:ios_armv7": posix_copts_cxx,
"@build_bazel_rules_apple//apple:ios_arm64": posix_copts_cxx, "@build_bazel_rules_apple//apple:ios_arm64": posix_copts_cxx,
"//build-system:ios_sim_arm64": posix_copts_cxx, "//build-system:ios_sim_arm64": posix_copts_cxx,
"@build_bazel_rules_apple//apple:ios_x86_64": posix_copts_cxx, "@build_bazel_rules_apple//apple:ios_x86_64": posix_copts_cxx,
@ -108,7 +104,6 @@ cc_library(
copts = boringssl_copts_c11, copts = boringssl_copts_c11,
includes = ["src/include"], includes = ["src/include"],
linkopts = select({ linkopts = select({
"@build_bazel_rules_apple//apple:ios_armv7": [],
"@build_bazel_rules_apple//apple:ios_arm64": [], "@build_bazel_rules_apple//apple:ios_arm64": [],
"//build-system:ios_sim_arm64": [], "//build-system:ios_sim_arm64": [],
"@build_bazel_rules_apple//apple:ios_x86_64": [], "@build_bazel_rules_apple//apple:ios_x86_64": [],

View File

@ -26,7 +26,6 @@ x86_64_specific_flags = [
] ]
arch_specific_cflags = select({ arch_specific_cflags = select({
"@build_bazel_rules_apple//apple:ios_armv7": common_flags + arm_specific_flags,
"@build_bazel_rules_apple//apple:ios_arm64": common_flags + arm64_specific_flags, "@build_bazel_rules_apple//apple:ios_arm64": common_flags + arm64_specific_flags,
"//build-system:ios_sim_arm64": common_flags + arm64_specific_flags, "//build-system:ios_sim_arm64": common_flags + arm64_specific_flags,
"@build_bazel_rules_apple//apple:ios_x86_64": common_flags + x86_64_specific_flags, "@build_bazel_rules_apple//apple:ios_x86_64": common_flags + x86_64_specific_flags,

View File

@ -54,21 +54,18 @@ arm_specific_copts = [
] ]
arch_specific_sources = select({ arch_specific_sources = select({
"@build_bazel_rules_apple//apple:ios_armv7": arm_specific_sources,
"@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_sources, "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_sources,
"//build-system:ios_sim_arm64": arm64_specific_sources, "//build-system:ios_sim_arm64": arm64_specific_sources,
"@build_bazel_rules_apple//apple:ios_x86_64": [], "@build_bazel_rules_apple//apple:ios_x86_64": [],
}) })
arch_specific_copts = select({ arch_specific_copts = select({
"@build_bazel_rules_apple//apple:ios_armv7": arm_specific_copts,
"@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_copts, "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_copts,
"//build-system:ios_sim_arm64": arm64_specific_copts, "//build-system:ios_sim_arm64": arm64_specific_copts,
"@build_bazel_rules_apple//apple:ios_x86_64": [], "@build_bazel_rules_apple//apple:ios_x86_64": [],
}) })
arch_specific_textual_hdrs = select({ arch_specific_textual_hdrs = select({
"@build_bazel_rules_apple//apple:ios_armv7": arm_specific_textual_hdrs,
"@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_textual_hdrs, "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_textual_hdrs,
"//build-system:ios_sim_arm64": arm64_specific_textual_hdrs, "//build-system:ios_sim_arm64": arm64_specific_textual_hdrs,
"@build_bazel_rules_apple//apple:ios_x86_64": [], "@build_bazel_rules_apple//apple:ios_x86_64": [],

View File

@ -3254,7 +3254,6 @@ x86_specific_sources = [webrtc_source_dir + "/" + path for path in [
]] ]]
arch_specific_sources = select({ arch_specific_sources = select({
"@build_bazel_rules_apple//apple:ios_armv7": common_arm_specific_sources + armv7_specific_sources,
"@build_bazel_rules_apple//apple:ios_arm64": common_arm_specific_sources + arm64_specific_sources, "@build_bazel_rules_apple//apple:ios_arm64": common_arm_specific_sources + arm64_specific_sources,
"//build-system:ios_sim_arm64": common_arm_specific_sources + arm64_specific_sources, "//build-system:ios_sim_arm64": common_arm_specific_sources + arm64_specific_sources,
"@build_bazel_rules_apple//apple:ios_x86_64": x86_specific_sources, "@build_bazel_rules_apple//apple:ios_x86_64": x86_specific_sources,
@ -3307,15 +3306,12 @@ x86_64_specific_flags = [
] ]
arch_specific_cflags = select({ arch_specific_cflags = select({
"@build_bazel_rules_apple//apple:ios_armv7": common_flags + arm_specific_flags,
"@build_bazel_rules_apple//apple:ios_arm64": common_flags + arm64_specific_flags, "@build_bazel_rules_apple//apple:ios_arm64": common_flags + arm64_specific_flags,
"//build-system:ios_sim_arm64": common_flags + arm64_specific_flags, "//build-system:ios_sim_arm64": common_flags + arm64_specific_flags,
"@build_bazel_rules_apple//apple:ios_x86_64": common_flags + x86_64_specific_flags, "@build_bazel_rules_apple//apple:ios_x86_64": common_flags + x86_64_specific_flags,
}) })
arch_specific_crc32c_sources = select({ arch_specific_crc32c_sources = select({
"@build_bazel_rules_apple//apple:ios_armv7": [
],
"@build_bazel_rules_apple//apple:ios_arm64": [ "@build_bazel_rules_apple//apple:ios_arm64": [
"dependencies/third_party/crc32c/src/crc32c_arm64.cc", "dependencies/third_party/crc32c/src/crc32c_arm64.cc",
], ],