Skip to content

Commit 59db0dc

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 7fe4538 commit 59db0dc

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
@@ -50,19 +50,14 @@ group("flutter") {
5050
"//flutter/sky",
5151
]
5252

53-
# Flutter SDK artifacts should only be built when either doing host builds, or
54-
# for cross-compiled desktop targets.
55-
build_engine_artifacts =
56-
current_toolchain == host_toolchain || (is_linux && !is_chromeos)
57-
5853
# If enbaled, compile the SDK / snapshot.
5954
if (!is_fuchsia) {
6055
public_deps += [
6156
"//flutter/lib/snapshot:generate_snapshot_bin",
6257
"//flutter/lib/snapshot:kernel_platform_files",
6358
]
6459

65-
if (build_engine_artifacts) {
60+
if (current_toolchain == host_toolchain) {
6661
public_deps += [
6762
"//flutter/flutter_frontend_server:frontend_server",
6863
"//third_party/dart:create_sdk",
@@ -79,7 +74,8 @@ group("flutter") {
7974
}
8075
}
8176

82-
if (build_engine_artifacts) {
77+
# If on the host, compile tools.
78+
if (current_toolchain == host_toolchain) {
8379
public_deps += [
8480
"//flutter/shell/testing",
8581
"//flutter/tools/const_finder",

DEPS

+1-10
Original file line numberDiff line numberDiff line change
@@ -630,23 +630,14 @@ hooks = [
630630
],
631631
},
632632
{
633-
'name': 'linux_sysroot_x64',
633+
'name': 'linux_sysroot',
634634
'pattern': '.',
635635
'condition': 'download_linux_deps',
636636
'action': [
637637
'python',
638638
'src/build/linux/sysroot_scripts/install-sysroot.py',
639639
'--arch=x64'],
640640
},
641-
{
642-
'name': 'linux_sysroot_arm64',
643-
'pattern': '.',
644-
'condition': 'download_linux_deps',
645-
'action': [
646-
'python',
647-
'src/build/linux/sysroot_scripts/install-sysroot.py',
648-
'--arch=arm64'],
649-
},
650641
{
651642
'name': 'dart package config',
652643
'pattern': '.',

0 commit comments

Comments
 (0)