[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?
engine-flutter-autoroll · Sep 20, 2023 · 52ef9d8 · 52ef9d8
1 parent 13e34bd
commit 52ef9d8
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 919 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -951,10 +951,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "chrome_and_driver", "version": "version:117.0"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
-          {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       shard: tool_integration_tests
       subshard: "1_4"
@@ -977,10 +975,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "chrome_and_driver", "version": "version:117.0"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
-          {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       shard: tool_integration_tests
       subshard: "2_4"
@@ -1003,10 +999,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "chrome_and_driver", "version": "version:117.0"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
-          {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       shard: tool_integration_tests
       subshard: "3_4"
@@ -1029,10 +1023,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "chrome_and_driver", "version": "version:117.0"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
-          {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       shard: tool_integration_tests
       subshard: "4_4"

diff --git a/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart b/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart
@@ -12,7 +12,6 @@ import '../../base/platform.dart';
 import '../../build_info.dart';
 import '../../dart/package_map.dart';
 import '../../ios/native_assets.dart';
-import '../../linux/native_assets.dart';
 import '../../macos/native_assets.dart';
 import '../../macos/xcode.dart';
 import '../../native_assets.dart';
@@ -119,21 +118,6 @@ class NativeAssets extends Target {
           fileSystem: fileSystem,
           buildRunner: buildRunner,
         );
-      case TargetPlatform.linux_arm64:
-      case TargetPlatform.linux_x64:
-        final String? environmentBuildMode = environment.defines[kBuildMode];
-        if (environmentBuildMode == null) {
-          throw MissingDefineException(kBuildMode, name);
-        }
-        final BuildMode buildMode = BuildMode.fromCliName(environmentBuildMode);
-        (_, dependencies) = await buildNativeAssetsLinux(
-          targetPlatform: targetPlatform,
-          buildMode: buildMode,
-          projectUri: projectUri,
-          yamlParentDirectory: environment.buildDir.uri,
-          fileSystem: fileSystem,
-          buildRunner: buildRunner,
-        );
       case TargetPlatform.tester:
         if (const LocalPlatform().isMacOS) {
           (_, dependencies) = await buildNativeAssetsMacOS(
@@ -145,15 +129,6 @@ class NativeAssets extends Target {
             buildRunner: buildRunner,
             flutterTester: true,
           );
-        } else if (const LocalPlatform().isLinux) {
-          (_, dependencies) = await buildNativeAssetsLinux(
-            buildMode: BuildMode.debug,
-            projectUri: projectUri,
-            yamlParentDirectory: environment.buildDir.uri,
-            fileSystem: fileSystem,
-            buildRunner: buildRunner,
-            flutterTester: true,
-          );
         } else {
           // TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757
           // Write the file we claim to have in the [outputs].
@@ -167,6 +142,8 @@ class NativeAssets extends Target {
       case TargetPlatform.android:
       case TargetPlatform.fuchsia_arm64:
       case TargetPlatform.fuchsia_x64:
+      case TargetPlatform.linux_arm64:
+      case TargetPlatform.linux_x64:
       case TargetPlatform.web_javascript:
       case TargetPlatform.windows_x64:
         // TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757

diff --git a/packages/flutter_tools/lib/src/linux/build_linux.dart b/packages/flutter_tools/lib/src/linux/build_linux.dart
@@ -17,7 +17,6 @@ import '../convert.dart';
 import '../flutter_plugins.dart';
 import '../globals.dart' as globals;
 import '../migrations/cmake_custom_command_migration.dart';
-import '../migrations/cmake_native_assets_migration.dart';
 
 // Matches the following error and warning patterns:
 // - <file path>:<line>:<column>: (fatal) error: <error...>
@@ -46,7 +45,6 @@ Future<void> buildLinux(
 
   final List<ProjectMigrator> migrators = <ProjectMigrator>[
     CmakeCustomCommandMigration(linuxProject, logger),
-    CmakeNativeAssetsMigration(linuxProject, 'linux', logger),
   ];
 
   final ProjectMigration migration = ProjectMigration(migrators);

diff --git a/packages/flutter_tools/lib/src/linux/native_assets.dart b/packages/flutter_tools/lib/src/linux/native_assets.dart