Reverts "Move native assets to isolated/ directory" (#143027)

Reverts flutter/flutter#142709

Initiated by: vashworth

Reason for reverting: `Mac tool_tests_general` started failing on this commit: https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20tool_tests_general/15552/overview

Original PR Author: dcharkes

Reviewed By: {christopherfujino, chingjun, reidbaker}

This change reverts the following previous change:
Original Description:
Native assets in other build systems are not built with `package:native_assets_builder` invoking `build.dart` scripts. Instead all packages have their own blaze rules. Therefore we'd like to not depend on `package:native_assets_builder` from flutter tools in g3 at all.

This PR aims to move the imports of `native_assets_builder` and `native_assets_cli` into the `isolated/` directory and into the files with a `main` function that are not used in with other build systems.

In order to be able to remove all imports in files used by other build systems, two new interfaces are added `HotRunnerNativeAssetsBuilder` and `TestCompilerNativeAssetsBuilder`. New parameters are then piped all the way through from the entry points:

* bin/fuchsia_tester.dart
* lib/executable.dart

The build_system/targets dir is already excluded in other build systems.

So, after this PR only the two above files and build_system/targets import from `isolated/native_assets/` and only `isolated/native_assets/` import `package:native_assets_cli` and `package:native_assets_builder`.

Context:

* flutter/flutter#142041

Author: auto-submit[bot]

packages/flutter_tools/bin/fuchsia_tester.dart

@@ -16,7 +16,6 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/context_runner.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
-import 'package:flutter_tools/src/isolated/native_assets/test/native_assets.dart';
 import 'package:flutter_tools/src/project.dart';
 import 'package:flutter_tools/src/reporting/reporting.dart';
 import 'package:flutter_tools/src/test/coverage_collector.dart';
@@ -154,7 +153,6 @@ Future<void> run(List<String> args) async {
       concurrency: math.max(1, globals.platform.numberOfProcessors - 2),
       icudtlPath: globals.fs.path.absolute(argResults[_kOptionIcudtl] as String),
       coverageDirectory: coverageDirectory,
-      nativeAssetsBuilder: const TestCompilerNativeAssetsBuilderImpl(),
     );
 
     if (collector != null) {

packages/flutter_tools/lib/executable.dart

@@ -50,8 +50,6 @@ import 'src/globals.dart' as globals;
 // Files in `isolated` are intentionally excluded from google3 tooling.
 import 'src/isolated/build_targets.dart';
 import 'src/isolated/mustache_template.dart';
-import 'src/isolated/native_assets/native_assets.dart';
-import 'src/isolated/native_assets/test/native_assets.dart';
 import 'src/isolated/resident_web_runner.dart';
 import 'src/pre_run_validator.dart';
 import 'src/project_validator.dart';
@@ -179,7 +177,6 @@ List<FlutterCommand> generateCommands({
     platform: globals.platform,
     processInfo: globals.processInfo,
     fileSystem: globals.fs,
-    nativeAssetsBuilder: const HotRunnerNativeAssetsBuilderImpl(),
   ),
   BuildCommand(
     artifacts: globals.artifacts!,
@@ -240,17 +237,10 @@ List<FlutterCommand> generateCommands({
     platform: globals.platform,
     featureFlags: featureFlags,
   ),
-  RunCommand(
-    verboseHelp: verboseHelp,
-    nativeAssetsBuilder: const HotRunnerNativeAssetsBuilderImpl(),
-  ),
+  RunCommand(verboseHelp: verboseHelp),
   ScreenshotCommand(fs: globals.fs),
   ShellCompletionCommand(),
-  TestCommand(
-    verboseHelp: verboseHelp,
-    verbose: verbose,
-    nativeAssetsBuilder: const TestCompilerNativeAssetsBuilderImpl(),
-  ),
+  TestCommand(verboseHelp: verboseHelp, verbose: verbose),
   UpgradeCommand(verboseHelp: verboseHelp),
   SymbolizeCommand(
     stdio: globals.stdio,

packages/flutter_tools/lib/src/isolated/native_assets/android/native_assets.dart renamed to packages/flutter_tools/lib/src/android/native_assets.dart

@@ -4,17 +4,17 @@
 
 import 'package:native_assets_builder/native_assets_builder.dart'
     show BuildResult, DryRunResult;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:native_assets_cli/native_assets_cli_internal.dart'
     hide BuildMode;
+import 'package:native_assets_cli/native_assets_cli_internal.dart'
+    as native_assets_cli;
 
-import '../../../android/android_sdk.dart';
-import '../../../base/common.dart';
-import '../../../base/file_system.dart';
-import '../../../build_info.dart';
-import '../../../globals.dart' as globals;
+import '../base/common.dart';
+import '../base/file_system.dart';
+import '../build_info.dart';
+import '../globals.dart' as globals;
 import '../native_assets.dart';
+import 'android_sdk.dart';
 
 /// Dry run the native builds.
 ///

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

@@ -7,18 +7,18 @@ import 'package:native_assets_cli/native_assets_cli_internal.dart' show Asset;
 import 'package:package_config/package_config_types.dart';
 
 import '../../android/gradle_utils.dart';
+import '../../android/native_assets.dart';
 import '../../base/common.dart';
 import '../../base/file_system.dart';
 import '../../base/platform.dart';
 import '../../build_info.dart';
 import '../../dart/package_map.dart';
-import '../../isolated/native_assets/android/native_assets.dart';
-import '../../isolated/native_assets/ios/native_assets.dart';
-import '../../isolated/native_assets/linux/native_assets.dart';
-import '../../isolated/native_assets/macos/native_assets.dart';
-import '../../isolated/native_assets/native_assets.dart';
-import '../../isolated/native_assets/windows/native_assets.dart';
+import '../../ios/native_assets.dart';
+import '../../linux/native_assets.dart';
+import '../../macos/native_assets.dart';
 import '../../macos/xcode.dart';
+import '../../native_assets.dart';
+import '../../windows/native_assets.dart';
 import '../build_system.dart';
 import '../depfile.dart';
 import '../exceptions.dart';

packages/flutter_tools/lib/src/commands/attach.dart

@@ -71,16 +71,14 @@ class AttachCommand extends FlutterCommand {
     required Platform platform,
     required ProcessInfo processInfo,
     required FileSystem fileSystem,
-    HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
   }) : _hotRunnerFactory = hotRunnerFactory ?? HotRunnerFactory(),
        _stdio = stdio,
        _logger = logger,
        _terminal = terminal,
        _signals = signals,
        _platform = platform,
        _processInfo = processInfo,
-       _fileSystem = fileSystem,
-       _nativeAssetsBuilder = nativeAssetsBuilder {
+       _fileSystem = fileSystem {
     addBuildModeFlags(verboseHelp: verboseHelp, defaultToRelease: false, excludeRelease: true);
     usesTargetOption();
     usesPortOptions(verboseHelp: verboseHelp);
@@ -152,7 +150,6 @@ class AttachCommand extends FlutterCommand {
   final Platform _platform;
   final ProcessInfo _processInfo;
   final FileSystem _fileSystem;
-  final HotRunnerNativeAssetsBuilder? _nativeAssetsBuilder;
 
   @override
   final String name = 'attach';
@@ -419,7 +416,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
           device: device,
           flutterProject: flutterProject,
           usesIpv6: usesIpv6,
-          nativeAssetsBuilder: _nativeAssetsBuilder,
         );
         late AppInstance app;
         try {
@@ -453,7 +449,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
           device: device,
           flutterProject: flutterProject,
           usesIpv6: usesIpv6,
-          nativeAssetsBuilder: _nativeAssetsBuilder,
         );
         final Completer<void> onAppStart = Completer<void>.sync();
         TerminalHandler? terminalHandler;
@@ -510,7 +505,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
     required Device device,
     required FlutterProject flutterProject,
     required bool usesIpv6,
-    required HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
   }) async {
     final BuildInfo buildInfo = await getBuildInfo();
 
@@ -545,7 +539,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
           ipv6: usesIpv6,
           flutterProject: flutterProject,
           nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile),
-          nativeAssetsBuilder: _nativeAssetsBuilder,
           analytics: analytics,
         )
       : ColdRunner(
@@ -580,7 +573,6 @@ class HotRunnerFactory {
     bool ipv6 = false,
     FlutterProject? flutterProject,
     String? nativeAssetsYamlFile,
-    required HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
     required Analytics analytics,
   }) => HotRunner(
     devices,
@@ -594,7 +586,6 @@ class HotRunnerFactory {
     stayResident: stayResident,
     ipv6: ipv6,
     nativeAssetsYamlFile: nativeAssetsYamlFile,
-    nativeAssetsBuilder: nativeAssetsBuilder,
     analytics: analytics,
   );
 }

packages/flutter_tools/lib/src/commands/daemon.dart

@@ -654,7 +654,6 @@ class AppDomain extends Domain {
     bool machine = true,
     String? userIdentifier,
     bool enableDevTools = true,
-    required HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
   }) async {
     if (!await device.supportsRuntimeMode(options.buildInfo.mode)) {
       throw Exception(
@@ -706,7 +705,6 @@ class AppDomain extends Domain {
         hostIsIde: true,
         machine: machine,
         analytics: globals.analytics,
-        nativeAssetsBuilder: nativeAssetsBuilder,
       );
     } else {
       runner = ColdRunner(

packages/flutter_tools/lib/src/commands/run.dart

@@ -334,11 +334,7 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment
 }
 
 class RunCommand extends RunCommandBase {
-  RunCommand({
-    bool verboseHelp = false,
-    HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
-  }) : _nativeAssetsBuilder = nativeAssetsBuilder,
-       super(verboseHelp: verboseHelp) {
+  RunCommand({ bool verboseHelp = false }) : super(verboseHelp: verboseHelp) {
     requiresPubspecYaml();
     usesFilesystemOptions(hide: !verboseHelp);
     usesExtraDartFlagOptions(verboseHelp: verboseHelp);
@@ -422,8 +418,6 @@ class RunCommand extends RunCommandBase {
       );
   }
 
-  final HotRunnerNativeAssetsBuilder? _nativeAssetsBuilder;
-
   @override
   final String name = 'run';
 
@@ -666,7 +660,6 @@ class RunCommand extends RunCommandBase {
         ipv6: ipv6 ?? false,
         analytics: globals.analytics,
         nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile),
-        nativeAssetsBuilder: _nativeAssetsBuilder,
       );
     } else if (webMode) {
       return webRunnerFactory!.createWebRunner(
@@ -740,7 +733,6 @@ class RunCommand extends RunCommandBase {
           ipv6: ipv6 ?? false,
           userIdentifier: userIdentifier,
           enableDevTools: boolArg(FlutterCommand.kEnableDevTools),
-          nativeAssetsBuilder: _nativeAssetsBuilder,
         );
       } on Exception catch (error) {
         throwToolExit(error.toString());

packages/flutter_tools/lib/src/commands/test.dart

@@ -18,7 +18,6 @@ import '../runner/flutter_command.dart';
 import '../test/coverage_collector.dart';
 import '../test/event_printer.dart';
 import '../test/runner.dart';
-import '../test/test_compiler.dart';
 import '../test/test_time_recorder.dart';
 import '../test/test_wrapper.dart';
 import '../test/watcher.dart';
@@ -64,7 +63,6 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
     this.testWrapper = const TestWrapper(),
     this.testRunner = const FlutterTestRunner(),
     this.verbose = false,
-    this.nativeAssetsBuilder,
   }) {
     requiresPubspecYaml();
     usesPubOption();
@@ -239,8 +237,6 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
   /// Interface for running the tester process.
   final FlutterTestRunner testRunner;
 
-  final TestCompilerNativeAssetsBuilder? nativeAssetsBuilder;
-
   final bool verbose;
 
   @visibleForTesting
@@ -508,7 +504,6 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
       integrationTestDevice: integrationTestDevice,
       integrationTestUserIdentifier: stringArg(FlutterOptions.kDeviceUser),
       testTimeRecorder: testTimeRecorder,
-      nativeAssetsBuilder: nativeAssetsBuilder,
     );
     testTimeRecorder?.stop(TestTimePhases.TestRunner, testRunnerTimeRecorderStopwatch!);
 

packages/flutter_tools/lib/src/isolated/native_assets/ios/native_assets.dart renamed to packages/flutter_tools/lib/src/ios/native_assets.dart

@@ -9,9 +9,9 @@ import 'package:native_assets_cli/native_assets_cli_internal.dart'
 import 'package:native_assets_cli/native_assets_cli_internal.dart'
     as native_assets_cli;
 
-import '../../../base/file_system.dart';
-import '../../../build_info.dart';
-import '../../../globals.dart' as globals;
+import '../base/file_system.dart';
+import '../build_info.dart';
+import '../globals.dart' as globals;
 
 import '../macos/native_assets_host.dart';
 import '../native_assets.dart';

packages/flutter_tools/lib/src/isolated/native_assets/README.md

@@ -5,11 +5,11 @@
 import 'package:native_assets_cli/native_assets_cli_internal.dart'
     hide BuildMode;
 
-import '../../../base/common.dart';
-import '../../../base/file_system.dart';
-import '../../../base/io.dart';
-import '../../../build_info.dart';
-import '../../../globals.dart' as globals;
+import '../base/common.dart';
+import '../base/file_system.dart';
+import '../base/io.dart';
+import '../build_info.dart';
+import '../globals.dart' as globals;
 import '../native_assets.dart';
 
 /// Dry run the native builds.

packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart

@@ -9,9 +9,9 @@ import 'package:native_assets_cli/native_assets_cli_internal.dart'
 import 'package:native_assets_cli/native_assets_cli_internal.dart'
     as native_assets_cli;
 
-import '../../../base/file_system.dart';
-import '../../../build_info.dart';
-import '../../../globals.dart' as globals;
+import '../base/file_system.dart';
+import '../build_info.dart';
+import '../globals.dart' as globals;
 import '../native_assets.dart';
 import 'native_assets_host.dart';