From 065bf2d0255fd7851861e332b2fef0b39c876210 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Wed, 12 Apr 2023 23:44:40 +0400 Subject: [PATCH] Revert watch experiments --- .bazelrc | 3 -- .gitmodules | 2 +- Telegram/BUILD | 6 ++-- WORKSPACE | 14 +++++----- build-system/Make/Make.py | 59 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 68 insertions(+), 16 deletions(-) diff --git a/.bazelrc b/.bazelrc index 9f455285f7..f1cda53727 100644 --- a/.bazelrc +++ b/.bazelrc @@ -35,6 +35,3 @@ build --spawn_strategy=standalone build --strategy=SwiftCompile=standalone build --define RULES_SWIFT_BUILD_DUMMY_WORKER=1 -build --apple_crosstool_top=@local_config_apple_cc//:toolchain -build --crosstool_top=@local_config_apple_cc//:toolchain -build --host_crosstool_top=@local_config_apple_cc//:toolchain diff --git a/.gitmodules b/.gitmodules index 62be224db0..d4b6047ecd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ url=https://github.com/ali-fareed/rules_apple.git url=https://github.com/bazelbuild/rules_swift.git [submodule "build-system/bazel-rules/apple_support"] path = build-system/bazel-rules/apple_support -url=https://github.com/ali-fareed/apple_support.git + url = https://github.com/bazelbuild/apple_support.git [submodule "submodules/TgVoip/libtgvoip"] path = submodules/TgVoip/libtgvoip url = https://github.com/telegramdesktop/libtgvoip.git diff --git a/Telegram/BUILD b/Telegram/BUILD index f52f037129..ac96cc11c6 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -123,7 +123,7 @@ genrule( ) minimum_os_version = "11.0" -minimum_watchos_version="5.0" +minimum_watchos_version="9.0" empty_languages = [ "ar", @@ -740,7 +740,7 @@ genrule( name = "StripWatchosStubBinary", cmd_bash = """ - echo 'lipo -remove arm64e $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK && lipo -remove arm64e $$1/TelegramWatch.app/TelegramWatch -output $$1/TelegramWatch.app/TelegramWatch' > $(location StripWatchosStubBinary.sh) + echo 'lipo -remove armv7k -remove arm64 -remove arm64e $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK' > $(location StripWatchosStubBinary.sh) echo '' >> $(location StripWatchosStubBinary.sh) """, outs = [ @@ -1970,7 +1970,7 @@ ios_application( }), watch_application = select({ ":disableExtensionsSetting": None, - "//conditions:default": ":TelegramWatchApp", + "//conditions:default": None#":TelegramWatchApp", }) if telegram_enable_watch else None, deps = [ ":Main", diff --git a/WORKSPACE b/WORKSPACE index ad6d31c26b..fa23cf7b1a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -31,13 +31,6 @@ local_repository( path = "build-system/bazel-rules/rules_xcodeproj", ) -load( - "@build_bazel_apple_support//lib:repositories.bzl", - "apple_support_dependencies", -) - -apple_support_dependencies() - load( "@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies", @@ -52,6 +45,13 @@ load( swift_rules_dependencies() +load( + "@build_bazel_apple_support//lib:repositories.bzl", + "apple_support_dependencies", +) + +apple_support_dependencies() + load( "@rules_xcodeproj//xcodeproj:repositories.bzl", "xcodeproj_rules_dependencies", diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py index 52767ccc79..6506859acb 100644 --- a/build-system/Make/Make.py +++ b/build-system/Make/Make.py @@ -149,7 +149,18 @@ class BazelCommandLine: self.disable_provisioning_profiles = True def set_configuration(self, configuration): - if configuration == 'debug_arm64': + if configuration == 'debug_universal': + self.configuration_args = [ + # bazel debug build configuration + '-c', 'dbg', + + # Build universal binaries. + '--ios_multi_cpus=armv7,arm64', + + # Always build universal Watch binaries. + '--watchos_cpus=arm64_32' + ] + self.common_debug_args + elif configuration == 'debug_arm64': self.configuration_args = [ # bazel debug build configuration '-c', 'dbg', @@ -179,6 +190,16 @@ class BazelCommandLine: # Build single-architecture binaries. It is almost 2 times faster is 32-bit support is not required. '--ios_multi_cpus=sim_arm64', + # Always build universal Watch binaries. + '--watchos_cpus=arm64_32' + ] + self.common_debug_args + elif configuration == 'debug_armv7': + self.configuration_args = [ + # bazel debug build configuration + '-c', 'dbg', + + '--ios_multi_cpus=armv7', + # Always build universal Watch binaries. '--watchos_cpus=arm64_32' ] + self.common_debug_args @@ -191,11 +212,45 @@ class BazelCommandLine: '--ios_multi_cpus=arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32,arm64', + '--watchos_cpus=arm64_32', # Generate DSYM files when building. '--apple_generate_dsym', + # Require DSYM files as build output. + '--output_groups=+dsyms' + ] + self.common_release_args + elif configuration == 'release_armv7': + self.configuration_args = [ + # bazel optimized build configuration + '-c', 'opt', + + # Build single-architecture binaries. It is almost 2 times faster is 32-bit support is not required. + '--ios_multi_cpus=armv7', + + # Always build universal Watch binaries. + '--watchos_cpus=arm64_32', + + # Generate DSYM files when building. + '--apple_generate_dsym', + + # Require DSYM files as build output. + '--output_groups=+dsyms' + ] + self.common_release_args + elif configuration == 'release_universal': + self.configuration_args = [ + # bazel optimized build configuration + '-c', 'opt', + + # Build universal binaries. + '--ios_multi_cpus=armv7,arm64', + + # Always build universal Watch binaries. + '--watchos_cpus=arm64_32', + + # Generate DSYM files when building. + '--apple_generate_dsym', + # Require DSYM files as build output. '--output_groups=+dsyms' ] + self.common_release_args