Skip to content

Commit 52ef9d8

Browse files
authored
[flutter roll] Revert "Native assets support for Linux" (#135069)
Reverts flutter/flutter#134031 context: b/301051367 Looked at the error message from the broken TAP target, but seems like the failure might be non trivial to resolve. Would it be okay if we revert this for now while it is being triaged?
1 parent 13e34bd commit 52ef9d8

File tree

12 files changed

+21
-919
lines changed

12 files changed

+21
-919
lines changed

.ci.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -951,10 +951,8 @@ targets:
951951
{"dependency": "android_sdk", "version": "version:33v6"},
952952
{"dependency": "chrome_and_driver", "version": "version:117.0"},
953953
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
954-
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
955-
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
956-
{"dependency": "ninja", "version": "version:1.9.0"},
957-
{"dependency": "open_jdk", "version": "version:11"}
954+
{"dependency": "open_jdk", "version": "version:11"},
955+
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
958956
]
959957
shard: tool_integration_tests
960958
subshard: "1_4"
@@ -977,10 +975,8 @@ targets:
977975
{"dependency": "android_sdk", "version": "version:33v6"},
978976
{"dependency": "chrome_and_driver", "version": "version:117.0"},
979977
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
980-
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
981-
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
982-
{"dependency": "ninja", "version": "version:1.9.0"},
983-
{"dependency": "open_jdk", "version": "version:11"}
978+
{"dependency": "open_jdk", "version": "version:11"},
979+
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
984980
]
985981
shard: tool_integration_tests
986982
subshard: "2_4"
@@ -1003,10 +999,8 @@ targets:
1003999
{"dependency": "android_sdk", "version": "version:33v6"},
10041000
{"dependency": "chrome_and_driver", "version": "version:117.0"},
10051001
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
1006-
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
1007-
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
1008-
{"dependency": "ninja", "version": "version:1.9.0"},
1009-
{"dependency": "open_jdk", "version": "version:11"}
1002+
{"dependency": "open_jdk", "version": "version:11"},
1003+
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
10101004
]
10111005
shard: tool_integration_tests
10121006
subshard: "3_4"
@@ -1029,10 +1023,8 @@ targets:
10291023
{"dependency": "android_sdk", "version": "version:33v6"},
10301024
{"dependency": "chrome_and_driver", "version": "version:117.0"},
10311025
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
1032-
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
1033-
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
1034-
{"dependency": "ninja", "version": "version:1.9.0"},
1035-
{"dependency": "open_jdk", "version": "version:11"}
1026+
{"dependency": "open_jdk", "version": "version:11"},
1027+
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
10361028
]
10371029
shard: tool_integration_tests
10381030
subshard: "4_4"

packages/flutter_tools/lib/src/build_system/targets/native_assets.dart

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import '../../base/platform.dart';
1212
import '../../build_info.dart';
1313
import '../../dart/package_map.dart';
1414
import '../../ios/native_assets.dart';
15-
import '../../linux/native_assets.dart';
1615
import '../../macos/native_assets.dart';
1716
import '../../macos/xcode.dart';
1817
import '../../native_assets.dart';
@@ -119,21 +118,6 @@ class NativeAssets extends Target {
119118
fileSystem: fileSystem,
120119
buildRunner: buildRunner,
121120
);
122-
case TargetPlatform.linux_arm64:
123-
case TargetPlatform.linux_x64:
124-
final String? environmentBuildMode = environment.defines[kBuildMode];
125-
if (environmentBuildMode == null) {
126-
throw MissingDefineException(kBuildMode, name);
127-
}
128-
final BuildMode buildMode = BuildMode.fromCliName(environmentBuildMode);
129-
(_, dependencies) = await buildNativeAssetsLinux(
130-
targetPlatform: targetPlatform,
131-
buildMode: buildMode,
132-
projectUri: projectUri,
133-
yamlParentDirectory: environment.buildDir.uri,
134-
fileSystem: fileSystem,
135-
buildRunner: buildRunner,
136-
);
137121
case TargetPlatform.tester:
138122
if (const LocalPlatform().isMacOS) {
139123
(_, dependencies) = await buildNativeAssetsMacOS(
@@ -145,15 +129,6 @@ class NativeAssets extends Target {
145129
buildRunner: buildRunner,
146130
flutterTester: true,
147131
);
148-
} else if (const LocalPlatform().isLinux) {
149-
(_, dependencies) = await buildNativeAssetsLinux(
150-
buildMode: BuildMode.debug,
151-
projectUri: projectUri,
152-
yamlParentDirectory: environment.buildDir.uri,
153-
fileSystem: fileSystem,
154-
buildRunner: buildRunner,
155-
flutterTester: true,
156-
);
157132
} else {
158133
// TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757
159134
// Write the file we claim to have in the [outputs].
@@ -167,6 +142,8 @@ class NativeAssets extends Target {
167142
case TargetPlatform.android:
168143
case TargetPlatform.fuchsia_arm64:
169144
case TargetPlatform.fuchsia_x64:
145+
case TargetPlatform.linux_arm64:
146+
case TargetPlatform.linux_x64:
170147
case TargetPlatform.web_javascript:
171148
case TargetPlatform.windows_x64:
172149
// TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757

packages/flutter_tools/lib/src/linux/build_linux.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import '../convert.dart';
1717
import '../flutter_plugins.dart';
1818
import '../globals.dart' as globals;
1919
import '../migrations/cmake_custom_command_migration.dart';
20-
import '../migrations/cmake_native_assets_migration.dart';
2120

2221
// Matches the following error and warning patterns:
2322
// - <file path>:<line>:<column>: (fatal) error: <error...>
@@ -46,7 +45,6 @@ Future<void> buildLinux(
4645

4746
final List<ProjectMigrator> migrators = <ProjectMigrator>[
4847
CmakeCustomCommandMigration(linuxProject, logger),
49-
CmakeNativeAssetsMigration(linuxProject, 'linux', logger),
5048
];
5149

5250
final ProjectMigration migration = ProjectMigration(migrators);

packages/flutter_tools/lib/src/linux/native_assets.dart

Lines changed: 0 additions & 238 deletions
This file was deleted.

0 commit comments

Comments
 (0)