DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Require armv7 in create_ios_framework.py (flutter/engine#4944)

Browse Source 
This enforces that iOS Flutter.framework builds include arm64, armv7,
and x86_64 (simulator) architectures. This change also eliminates the
previous --device-out-dir option, which has been replaced by
--arm64-out-dir.
This commit is contained in:
Chris Bracken 2018-04-05 17:43:30 -07:00 committed by GitHub
parent 9eae92b797
commit 29effd38b1
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engine/src/flutter/sky/tools/create_ios_framework.py
View File

@ -14,32 +14,26 @@ def main():
parser = argparse.ArgumentParser(description='Creates Flutter.framework')
parser.add_argument('--dst', type=str, required=True)
# TODO(cbracken) eliminate --device-out-dir and make armv7-out-dir and
# arm64-out-dir required once bot recipe is updated.
parser.add_argument('--device-out-dir', type=str, required=False)
parser.add_argument('--arm64-out-dir', type=str, required=False)
parser.add_argument('--armv7-out-dir', type=str, required=False)
parser.add_argument('--arm64-out-dir', type=str, required=True)
parser.add_argument('--armv7-out-dir', type=str, required=True)
parser.add_argument('--simulator-out-dir', type=str, required=True)
args = parser.parse_args()
if not (args.arm64_out_dir or args.device_out_dir):
print 'One of --device-out-dir or --arm64-out-dir must be specified'
fat_framework = os.path.join(args.dst, 'Flutter.framework')
arm64_framework = os.path.join(args.arm64_out_dir if args.arm64_out_dir else args.device_out_dir, 'Flutter.framework')
armv7_framework = os.path.join(args.armv7_out_dir, 'Flutter.framework') if args.armv7_out_dir else None
arm64_framework = os.path.join(args.arm64_out_dir, 'Flutter.framework')
armv7_framework = os.path.join(args.armv7_out_dir, 'Flutter.framework')
simulator_framework = os.path.join(args.simulator_out_dir, 'Flutter.framework')
arm64_dylib = os.path.join(arm64_framework, 'Flutter')
armv7_dylib = os.path.join(armv7_framework, 'Flutter') if args.armv7_out_dir else None
armv7_dylib = os.path.join(armv7_framework, 'Flutter')
simulator_dylib = os.path.join(simulator_framework, 'Flutter')
if not os.path.isdir(arm64_framework):
print 'Cannot find iOS arm64 Framework at', arm64_framework
return 1
# TODO(cbracken): require armv7 once bot recipe is updated.
if armv7_framework and not os.path.isdir(armv7_framework):
if not os.path.isdir(armv7_framework):
print 'Cannot find iOS armv7 Framework at', armv7_framework
return 1
@ -51,8 +45,7 @@ def main():
print 'Cannot find iOS arm64 dylib at', arm64_dylib
return 1
# TODO(cbracken): require armv7 once bot recipe is updated.
if armv7_dylib and not os.path.isfile(armv7_dylib):
if not os.path.isfile(armv7_dylib):
print 'Cannot find iOS armv7 dylib at', armv7_dylib
return 1
@ -63,12 +56,11 @@ def main():
shutil.rmtree(fat_framework, True)
shutil.copytree(arm64_framework, fat_framework)
# TODO(cbracken): require armv7 once bot recipe is updated.
dylibs = [arm64_dylib, simulator_dylib]
if armv7_dylib:
dylibs += [armv7_dylib]
subprocess.call(['lipo'] + dylibs + [
subprocess.call([
'lipo',
arm64_dylib,
armv7_dylib,
simulator_dylib,
'-create',
'-output',
os.path.join(fat_framework, 'Flutter')