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

Fixes for the Windows arm64 build (flutter/engine#33681)

Browse Source 
* Fixes for the Windows arm64 build

* Update buildroot to 53abad0fa9c9e0285e80f9b0682316d5d39705be

* Update buildroot to f582982073b6f04b7a70bc284bac8fafa6c0a846
This commit is contained in:
Zachary Anderson 2022-05-31 08:06:47 -07:00 committed by GitHub
parent 2642e1ab69
commit 67d4e8ff38
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DEPS
View File

@ -111,7 +111,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6c00bc8d3d3c80e07e58c1f91d255dcefc420641',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f582982073b6f04b7a70bc284bac8fafa6c0a846',
# Fuchsia compatibility
#
@ -405,6 +405,16 @@ deps = {
'dep_type': 'cipd',
'condition': 'host_os == "win"'
},
'src/flutter/prebuilts/windows-arm64/dart-sdk': {
'packages': [
{
'package': 'flutter/dart-sdk/windows-arm64',
'version': 'git_revision:'+Var('dart_revision')
}
],
'dep_type': 'cipd',
'condition': 'host_os == "win"'
},
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',

15
engine/src/flutter/build/git_revision.py
View File

@ -6,21 +6,26 @@
"""Get the Git HEAD revision of a specified Git repository."""
import sys
import subprocess
import os
import argparse
def IsWindows():
os_id = sys.platform
return os_id.startswith('win32') or os_id.startswith('cygwin')
def GetRepositoryVersion(repository):
"Returns the Git HEAD for the supplied repository path as a string."
if not os.path.exists(repository):
raise IOError("path doesn't exist")
git = 'git'
if IsWindows():
git = 'git.bat'
version = subprocess.check_output([
'git',
git,
'-C',
repository,
'rev-parse',
@ -29,6 +34,7 @@ def GetRepositoryVersion(repository):
return str(version.strip(), 'utf-8')
def main():
parser = argparse.ArgumentParser()
@ -44,5 +50,6 @@ def main():
return 0
if __name__ == '__main__':
sys.exit(main())

2
engine/src/flutter/tools/gn
View File

@ -116,6 +116,8 @@ def can_use_prebuilt_dart(args):
prebuilt = 'linux-%s' % args.linux_cpu
elif args.target_os == 'mac' and args.mac_cpu in ['x64', 'arm64']:
prebuilt = 'macos-%s' % args.mac_cpu
elif args.target_os == 'win' and args.windows_cpu in ['x64', 'arm64']:
prebuilt = 'windows-%s' % args.windows_cpu
prebuilts_dir = None
if prebuilt != None: