Add ARM64 build and binary distribution support (see issue #1990)

Adds a new `--arm64-build` option to automate-git.py and make_distrib.py.
This commit is contained in:
David Sowa
2019-06-13 11:45:50 +02:00
committed by Marshall Greenblatt
parent c3c3af34fd
commit f0c82200ba
8 changed files with 392 additions and 18 deletions

View File

@ -478,6 +478,12 @@ parser.add_option(
dest='armbuild',
default=False,
help='create an ARM binary distribution (Linux only)')
parser.add_option(
'--arm64-build',
action='store_true',
dest='arm64build',
default=False,
help='create an ARM64 binary distribution (Linux only)')
parser.add_option(
'--minimal',
action='store_true',
@ -530,13 +536,13 @@ if options.minimal and options.client:
parser.print_help(sys.stderr)
sys.exit()
if options.x64build and options.armbuild:
print 'Cannot specify both --x64-build and --arm-build'
if options.x64build + options.armbuild + options.arm64build > 1:
print 'Invalid combination of build options.'
parser.print_help(sys.stderr)
sys.exit()
if options.armbuild and platform != 'linux':
print '--arm-build is only supported on Linux.'
if (options.armbuild or options.arm64build) and platform != 'linux':
print '--arm-build and --arm64-build only supported on Linux.'
sys.exit()
if options.sandbox and not platform in ('macosx', 'windows'):
@ -586,15 +592,14 @@ chromium_ver = formatter.get_chromium_version_string()
archive_dirs = []
if options.x64build:
if options.armbuild:
platform_arch = 'arm64'
binary_arch = 'arm64'
else:
platform_arch = '64'
binary_arch = 'x64'
platform_arch = '64'
binary_arch = 'x64'
elif options.armbuild:
platform_arch = 'arm'
binary_arch = 'arm'
elif options.arm64build:
platform_arch = 'arm64'
binary_arch = 'arm64'
else:
platform_arch = '32'
binary_arch = 'x86'
@ -644,6 +649,8 @@ if options.x64build:
build_dir_suffix = '_GN_x64'
elif options.armbuild:
build_dir_suffix = '_GN_arm'
elif options.arm64build:
build_dir_suffix = '_GN_arm64'
else:
build_dir_suffix = '_GN_x86'