This commit is contained in:
Ali 2023-04-06 23:35:44 +04:00
parent ccf1b2c794
commit cddd414aa7
2 changed files with 3 additions and 58 deletions

View File

@ -740,7 +740,7 @@ genrule(
name = "StripWatchosStubBinary",
cmd_bash =
"""
echo 'lipo -remove arm64e $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK' > $(location StripWatchosStubBinary.sh)
echo 'lipo -remove arm64e -remove armv7k $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK && lipo -remove arm64e -remove armv7k $$1/TelegramWatch.app/TelegramWatch -output $$1/TelegramWatch.app/TelegramWatch' > $(location StripWatchosStubBinary.sh)
echo '' >> $(location StripWatchosStubBinary.sh)
""",
outs = [

View File

@ -149,18 +149,7 @@ class BazelCommandLine:
self.disable_provisioning_profiles = True
def set_configuration(self, configuration):
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':
if configuration == 'debug_arm64':
self.configuration_args = [
# bazel debug build configuration
'-c', 'dbg',
@ -190,16 +179,6 @@ 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
@ -212,45 +191,11 @@ class BazelCommandLine:
'--ios_multi_cpus=arm64',
# Always build universal Watch binaries.
'--watchos_cpus=arm64_32',
'--watchos_cpus=arm64_32,arm64',
# 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