From 44ad75f857eb3cb0450029111139d3223c6fb3c8 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Mon, 31 Jan 2022 00:59:09 +0400 Subject: [PATCH] Fix Xcode release builds (cherry picked from commit 56cd005e32c326a59f81494faaf1af7757dcbc24) --- Telegram/BUILD | 22 +++++++++++++++++++++- build-system/Make/ProjectGeneration.py | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Telegram/BUILD b/Telegram/BUILD index 24bdfa90c2..2dcae17b4a 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -2,6 +2,8 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", ) +load("@bazel_skylib//lib:selects.bzl", "selects") + load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_extension", @@ -74,6 +76,19 @@ config_setting( }, ) +bool_flag( + name = "disableStripping", + build_setting_default = False, + visibility = ["//visibility:public"], +) + +config_setting( + name = "disableStrippingSetting", + flag_values = { + ":disableStripping": "True", + }, +) + genrule( name = "empty", outs = ["empty.swift"], @@ -184,8 +199,13 @@ debug_deps = select({ "//conditions:default": [], }) +selects.config_setting_group( + name = "resolvedDisableStrippingSetting", + match_any = [":debug", ":disableStrippingSetting"], +) + strip_framework = select({ - ":debug": None, + ":resolvedDisableStrippingSetting": None, "//conditions:default": ":StripFramework", }) diff --git a/build-system/Make/ProjectGeneration.py b/build-system/Make/ProjectGeneration.py index c6d15f041a..2cb9e2e2f9 100644 --- a/build-system/Make/ProjectGeneration.py +++ b/build-system/Make/ProjectGeneration.py @@ -91,6 +91,8 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr bazel_build_arguments += ['--//{}:disableProvisioningProfiles'.format(app_target)] if generate_dsym: bazel_build_arguments += ['--apple_generate_dsym'] + bazel_build_arguments += ['--//{}:disableStripping'.format(app_target)] + bazel_build_arguments += ['--strip=never'] call_executable([ tulsi_path,