Skip to content

Commit 5434f80

Browse files
dwrobeltomasz-karczewski-red
authored andcommitted
Revert "Add support of cross-building the engine for ARM64 Linux Host (flutter#20254)"
This reverts commit 101d85a.
1 parent 6ca70c5 commit 5434f80

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
lines changed

AUTHORS

-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ Simon Lightfoot <[email protected]>
1515
Dwayne Slater <[email protected]>
1616
Tetsuhiro Ueda <[email protected]>
1717
shoryukenn <[email protected]>
18-
SOTEC GmbH & Co. KG <[email protected]>
19-
Hidenori Matsubayashi <[email protected]>
2018
Sarbagya Dhaubanjar <[email protected]>

BUILD.gn

+3-7
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,14 @@ group("flutter") {
4646
"//flutter/sky",
4747
]
4848

49-
# Flutter SDK artifacts should only be built when either doing host builds, or
50-
# for cross-compiled desktop targets.
51-
build_engine_artifacts =
52-
current_toolchain == host_toolchain || (is_linux && !is_chromeos)
53-
5449
# If enbaled, compile the SDK / snapshot.
5550
if (!is_fuchsia) {
5651
public_deps += [
5752
"//flutter/lib/snapshot:generate_snapshot_bin",
5853
"//flutter/lib/snapshot:kernel_platform_files",
5954
]
6055

61-
if (build_engine_artifacts) {
56+
if (current_toolchain == host_toolchain) {
6257
public_deps += [
6358
"//flutter/flutter_frontend_server:frontend_server",
6459
"//third_party/dart:create_sdk",
@@ -75,7 +70,8 @@ group("flutter") {
7570
}
7671
}
7772

78-
if (build_engine_artifacts) {
73+
# If on the host, compile tools.
74+
if (current_toolchain == host_toolchain) {
7975
public_deps += [
8076
"//flutter/shell/testing",
8177
"//flutter/tools/const_finder",

DEPS

+1-10
Original file line numberDiff line numberDiff line change
@@ -621,23 +621,14 @@ hooks = [
621621
],
622622
},
623623
{
624-
'name': 'linux_sysroot_x64',
624+
'name': 'linux_sysroot',
625625
'pattern': '.',
626626
'condition': 'download_linux_deps',
627627
'action': [
628628
'python',
629629
'src/build/linux/sysroot_scripts/install-sysroot.py',
630630
'--arch=x64'],
631631
},
632-
{
633-
'name': 'linux_sysroot_arm64',
634-
'pattern': '.',
635-
'condition': 'download_linux_deps',
636-
'action': [
637-
'python',
638-
'src/build/linux/sysroot_scripts/install-sysroot.py',
639-
'--arch=arm64'],
640-
},
641632
{
642633
'name': 'dart package config',
643634
'pattern': '.',

0 commit comments

Comments
 (0)