Unverified Commit 9bd50c54 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

Ensure fx flutter attach can find devices (#36564)

parent 4bc2bf67
...@@ -14,7 +14,10 @@ import 'package:flutter_tools/src/base/file_system.dart'; ...@@ -14,7 +14,10 @@ import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/attach.dart'; import 'package:flutter_tools/src/commands/attach.dart';
import 'package:flutter_tools/src/commands/doctor.dart'; import 'package:flutter_tools/src/commands/doctor.dart';
import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/fuchsia/fuchsia_device.dart';
import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart';
import 'package:flutter_tools/src/project.dart';
import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart';
final ArgParser parser = ArgParser() final ArgParser parser = ArgParser()
...@@ -101,6 +104,7 @@ Future<void> main(List<String> args) async { ...@@ -101,6 +104,7 @@ Future<void> main(List<String> args) async {
muteCommandLogging: false, muteCommandLogging: false,
verboseHelp: false, verboseHelp: false,
overrides: <Type, Generator>{ overrides: <Type, Generator>{
DeviceManager: () => _FuchsiaDeviceManager(),
FuchsiaArtifacts: () => FuchsiaArtifacts(sshConfig: sshConfig, devFinder: devFinder), FuchsiaArtifacts: () => FuchsiaArtifacts(sshConfig: sshConfig, devFinder: devFinder),
Artifacts: () => OverrideArtifacts( Artifacts: () => OverrideArtifacts(
parent: CachedArtifacts(), parent: CachedArtifacts(),
...@@ -113,6 +117,19 @@ Future<void> main(List<String> args) async { ...@@ -113,6 +117,19 @@ Future<void> main(List<String> args) async {
); );
} }
// An implementation of [DeviceManager] that only supports fuchsia devices.
class _FuchsiaDeviceManager extends DeviceManager {
@override
List<DeviceDiscovery> get deviceDiscoverers => List<DeviceDiscovery>.unmodifiable(<DeviceDiscovery>[
FuchsiaDevices(),
]);
@override
bool isDeviceSupportedForProject(Device device, FlutterProject flutterProject) {
return true;
}
}
List<String> _extractPathAndName(String gnTarget) { List<String> _extractPathAndName(String gnTarget) {
// Separate strings like //path/to/target:app into [path/to/target, app] // Separate strings like //path/to/target:app into [path/to/target, app]
final int lastColon = gnTarget.lastIndexOf(':'); final int lastColon = gnTarget.lastIndexOf(':');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment