Skip to content

Commit fc9220c

Browse files
Disable fuchsia in flutter_tools (flutter#155111)
This change disables fuchsia in flutter_tools, most of the fuchsia logic becomes no-op, so the test cases need to be removed altogether. This change needs to go first to avoid breaking dependencies. Bug: b/353729557
1 parent b755641 commit fc9220c

8 files changed

+1
-2330
lines changed

packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import '../base/file_system.dart';
88
import '../base/io.dart';
99
import '../base/platform.dart';
1010
import '../convert.dart';
11-
import '../features.dart' show featureFlags;
1211
import '../globals.dart' as globals;
1312

1413
import 'fuchsia_ffx.dart';
@@ -17,7 +16,7 @@ import 'fuchsia_pm.dart';
1716

1817
/// Returns [true] if the current platform supports Fuchsia targets.
1918
bool isFuchsiaSupportedPlatform(Platform platform) {
20-
return featureFlags.isFuchsiaEnabled && (platform.isLinux || platform.isMacOS);
19+
return false;
2120
}
2221

2322
/// The Fuchsia SDK shell commands.

packages/flutter_tools/test/general.shard/application_package_test.dart

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'package:flutter_tools/src/base/process.dart';
1414
import 'package:flutter_tools/src/base/user_messages.dart';
1515
import 'package:flutter_tools/src/build_info.dart';
1616
import 'package:flutter_tools/src/cache.dart';
17-
import 'package:flutter_tools/src/fuchsia/application_package.dart';
1817
import 'package:flutter_tools/src/globals.dart' as globals;
1918
import 'package:flutter_tools/src/ios/application_package.dart';
2019
import 'package:flutter_tools/src/ios/plist_parser.dart';
@@ -648,51 +647,6 @@ void main() {
648647
);
649648
}, overrides: overrides);
650649
});
651-
652-
group('FuchsiaApp', () {
653-
final Map<Type, Generator> overrides = <Type, Generator>{
654-
FileSystem: () => MemoryFileSystem.test(),
655-
ProcessManager: () => FakeProcessManager.any(),
656-
OperatingSystemUtils: () => FakeOperatingSystemUtils(),
657-
};
658-
659-
testUsingContext('Error on non-existing file', () {
660-
final PrebuiltFuchsiaApp? fuchsiaApp =
661-
FuchsiaApp.fromPrebuiltApp(globals.fs.file('not_existing.far')) as PrebuiltFuchsiaApp?;
662-
expect(fuchsiaApp, isNull);
663-
expect(
664-
testLogger.errorText,
665-
'File "not_existing.far" does not exist or is not a .far file. Use far archive.\n',
666-
);
667-
}, overrides: overrides);
668-
669-
testUsingContext('Error on non-far file', () {
670-
globals.fs.directory('regular_folder').createSync();
671-
final PrebuiltFuchsiaApp? fuchsiaApp =
672-
FuchsiaApp.fromPrebuiltApp(globals.fs.file('regular_folder')) as PrebuiltFuchsiaApp?;
673-
expect(fuchsiaApp, isNull);
674-
expect(
675-
testLogger.errorText,
676-
'File "regular_folder" does not exist or is not a .far file. Use far archive.\n',
677-
);
678-
}, overrides: overrides);
679-
680-
testUsingContext('Success with far file', () {
681-
globals.fs.file('bundle.far').createSync();
682-
final PrebuiltFuchsiaApp fuchsiaApp = FuchsiaApp.fromPrebuiltApp(globals.fs.file('bundle.far'))! as PrebuiltFuchsiaApp;
683-
expect(testLogger.errorText, isEmpty);
684-
expect(fuchsiaApp.id, 'bundle.far');
685-
expect(fuchsiaApp.applicationPackage.path, globals.fs.file('bundle.far').path);
686-
}, overrides: overrides);
687-
688-
testUsingContext('returns null when there is no fuchsia', () async {
689-
globals.fs.file('pubspec.yaml').createSync();
690-
globals.fs.file('.packages').createSync();
691-
final BuildableFuchsiaApp? fuchsiaApp = FuchsiaApp.fromFuchsiaProject(FlutterProject.fromDirectory(globals.fs.currentDirectory).fuchsia) as BuildableFuchsiaApp?;
692-
693-
expect(fuchsiaApp, null);
694-
}, overrides: overrides);
695-
});
696650
}
697651

698652
const String _aaptDataWithExplicitEnabledAndMainLauncherActivity = '''

0 commit comments

Comments
 (0)