Stop compiling iOS with bitcode (flutter/engine#36596)
This commit is contained in:
@@ -464,6 +464,7 @@ targets:
|
||||
runIf:
|
||||
- DEPS
|
||||
- .ci.yaml
|
||||
- ci/**
|
||||
|
||||
- name: Mac iOS Engine Release
|
||||
recipe: engine/engine
|
||||
@@ -475,6 +476,7 @@ targets:
|
||||
runIf:
|
||||
- DEPS
|
||||
- .ci.yaml
|
||||
- ci/**
|
||||
|
||||
- name: Linux ci_yaml engine roller
|
||||
bringup: true
|
||||
|
||||
@@ -11,7 +11,7 @@ engine.
|
||||
Precondition: $CWD/../../flutter is the path to the flutter engine repo.
|
||||
|
||||
usage: copy_info_plist.py --source <src_path> --destination <dest_path>
|
||||
--bitcode --minversion=<deployment_target>
|
||||
--minversion=<deployment_target>
|
||||
"""
|
||||
|
||||
import argparse
|
||||
@@ -21,14 +21,12 @@ import subprocess
|
||||
import git_revision
|
||||
|
||||
|
||||
def get_clang_version(bitcode):
|
||||
def get_clang_version():
|
||||
clang_executable = str(
|
||||
os.path.join(
|
||||
'..', '..', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++'
|
||||
)
|
||||
)
|
||||
if bitcode:
|
||||
clang_executable = 'clang++'
|
||||
version = subprocess.check_output([clang_executable, '--version'])
|
||||
return version.splitlines()[0]
|
||||
|
||||
@@ -52,9 +50,6 @@ def main():
|
||||
type=str,
|
||||
required=True
|
||||
)
|
||||
parser.add_argument(
|
||||
'--bitcode', help='Built with bitcode', action='store_true'
|
||||
)
|
||||
parser.add_argument(
|
||||
'--minversion', help='Minimum device OS version like "9.0"', type=str
|
||||
)
|
||||
@@ -64,8 +59,7 @@ def main():
|
||||
text = open(args.source).read()
|
||||
engine_path = os.path.join(os.getcwd(), '..', '..', 'flutter')
|
||||
revision = git_revision.get_repository_version(engine_path)
|
||||
bitcode = args.bitcode is not None
|
||||
clang_version = get_clang_version(bitcode)
|
||||
clang_version = get_clang_version()
|
||||
text = text.format(
|
||||
revision=revision,
|
||||
clang_version=clang_version,
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
"os=Mac-12"
|
||||
],
|
||||
"gn": [
|
||||
"--bitcode",
|
||||
"--ios",
|
||||
"--runtime-mode",
|
||||
"debug"
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
"--ios",
|
||||
"--runtime-mode",
|
||||
"profile",
|
||||
"--bitcode"
|
||||
],
|
||||
"name": "ios_profile",
|
||||
"ninja": {
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
"--ios",
|
||||
"--runtime-mode",
|
||||
"release",
|
||||
"--bitcode",
|
||||
"--no-goma"
|
||||
],
|
||||
"name": "ios_release",
|
||||
|
||||
@@ -340,9 +340,6 @@ action("copy_framework_info_plist") {
|
||||
"--minversion",
|
||||
ios_deployment_target,
|
||||
]
|
||||
if (enable_bitcode) {
|
||||
args += [ "--bitcode" ]
|
||||
}
|
||||
}
|
||||
|
||||
copy("copy_framework_module_map") {
|
||||
|
||||
@@ -420,9 +420,6 @@ if (is_mac && !embedder_for_target) {
|
||||
"--destination",
|
||||
rebase_path(outputs[0]),
|
||||
]
|
||||
if (enable_bitcode) {
|
||||
args += [ "--bitcode" ]
|
||||
}
|
||||
}
|
||||
|
||||
copy("copy_module_map") {
|
||||
|
||||
@@ -255,13 +255,6 @@ def to_gn_args(args):
|
||||
to_gn_wasm_args(args, gn_args)
|
||||
return gn_args
|
||||
|
||||
if args.bitcode:
|
||||
if args.target_os != 'ios':
|
||||
raise Exception('Bitcode is only supported for iOS')
|
||||
if runtime_mode != 'release':
|
||||
gn_args['bitcode_marker'] = True
|
||||
|
||||
gn_args['enable_bitcode'] = args.bitcode
|
||||
if args.enable_unittests:
|
||||
gn_args['enable_unittests'] = args.enable_unittests
|
||||
|
||||
@@ -884,8 +877,8 @@ def parse_args(args):
|
||||
parser.add_argument(
|
||||
'--bitcode',
|
||||
default=False,
|
||||
action='store_true',
|
||||
help='Enable bitcode for iOS targets. On debug runtime modes, this will be a marker only.'
|
||||
action='store_false',
|
||||
help='Deprecated, bitcode no longer supported.'
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
|
||||
Reference in New Issue
Block a user