From 058fd02953362c6cc48c720a646ece376aae3fc1 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 4 Oct 2022 14:56:13 -0700 Subject: [PATCH] Stop compiling iOS with bitcode (flutter/engine#36596) --- engine/src/flutter/.ci.yaml | 2 ++ engine/src/flutter/build/copy_info_plist.py | 12 +++--------- engine/src/flutter/ci/builders/mac_ios_engine.json | 1 - .../flutter/ci/builders/mac_ios_engine_profile.json | 1 - .../flutter/ci/builders/mac_ios_engine_release.json | 1 - .../src/flutter/shell/platform/darwin/ios/BUILD.gn | 3 --- engine/src/flutter/shell/platform/embedder/BUILD.gn | 3 --- engine/src/flutter/tools/gn | 11 ++--------- 8 files changed, 7 insertions(+), 27 deletions(-) diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index fa96845001..68c183e04d 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -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 diff --git a/engine/src/flutter/build/copy_info_plist.py b/engine/src/flutter/build/copy_info_plist.py index b589e7ce04..37e60bef3b 100644 --- a/engine/src/flutter/build/copy_info_plist.py +++ b/engine/src/flutter/build/copy_info_plist.py @@ -11,7 +11,7 @@ engine. Precondition: $CWD/../../flutter is the path to the flutter engine repo. usage: copy_info_plist.py --source --destination - --bitcode --minversion= + --minversion= """ 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, diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json index b390739414..2c775af54a 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine.json @@ -58,7 +58,6 @@ "os=Mac-12" ], "gn": [ - "--bitcode", "--ios", "--runtime-mode", "debug" diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_profile.json b/engine/src/flutter/ci/builders/mac_ios_engine_profile.json index 591dfc153e..724049479d 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine_profile.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine_profile.json @@ -56,7 +56,6 @@ "--ios", "--runtime-mode", "profile", - "--bitcode" ], "name": "ios_profile", "ninja": { diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_release.json b/engine/src/flutter/ci/builders/mac_ios_engine_release.json index 65d02956f2..38d14b13e5 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine_release.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine_release.json @@ -32,7 +32,6 @@ "--ios", "--runtime-mode", "release", - "--bitcode", "--no-goma" ], "name": "ios_release", diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn index 27fc1f7f4e..52e6261889 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn @@ -340,9 +340,6 @@ action("copy_framework_info_plist") { "--minversion", ios_deployment_target, ] - if (enable_bitcode) { - args += [ "--bitcode" ] - } } copy("copy_framework_module_map") { diff --git a/engine/src/flutter/shell/platform/embedder/BUILD.gn b/engine/src/flutter/shell/platform/embedder/BUILD.gn index a97e190d72..5f74522f91 100644 --- a/engine/src/flutter/shell/platform/embedder/BUILD.gn +++ b/engine/src/flutter/shell/platform/embedder/BUILD.gn @@ -420,9 +420,6 @@ if (is_mac && !embedder_for_target) { "--destination", rebase_path(outputs[0]), ] - if (enable_bitcode) { - args += [ "--bitcode" ] - } } copy("copy_module_map") { diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index a2b365c097..cf75cff52b 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -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(