Put fuchsia tools into their own directory, and set source_dir to point at them. (#52266)
This worksaround an issue with the latest version of package_config which doesn't handle
multiple dart packages sharing the same source directory. In this case, the fuchsia dart_tool
targets were sharing a directory with their dependency, :flutter_tools
diff --git a/packages/flutter_tools/BUILD.gn b/packages/flutter_tools/BUILD.gn
index ab51f88..4a21bef 100644
--- a/packages/flutter_tools/BUILD.gn
+++ b/packages/flutter_tools/BUILD.gn
@@ -56,7 +56,8 @@
}
dart_tool("fuchsia_builder") {
- main_dart = "bin/fuchsia_builder.dart"
+ main_dart = "bin/fuchsia/fuchsia_builder.dart"
+ source_dir = "bin/fuchsia"
disable_analysis = true
@@ -66,7 +67,8 @@
}
dart_tool("fuchsia_asset_builder") {
- main_dart = "bin/fuchsia_asset_builder.dart"
+ main_dart = "bin/fuchsia/fuchsia_asset_builder.dart"
+ source_dir = "bin/fuchsia"
disable_analysis = true
@@ -152,7 +154,8 @@
}
dart_tool("fuchsia_tester") {
- main_dart = "bin/fuchsia_tester.dart"
+ main_dart = "bin/fuchsia/fuchsia_tester.dart"
+ source_dir = "bin/fuchsia"
disable_analysis = true
@@ -247,7 +250,8 @@
dart_tool("fuchsia_attach") {
package_name = "fuchsia_attach"
- main_dart = "bin/fuchsia_attach.dart"
+ main_dart = "bin/fuchsia/fuchsia_attach.dart"
+ source_dir = "bin/fuchsia"
# Can be left empty as analysis is disabled.
sources = []
diff --git a/packages/flutter_tools/bin/fuchsia_asset_builder.dart b/packages/flutter_tools/bin/fuchsia/fuchsia_asset_builder.dart
similarity index 100%
rename from packages/flutter_tools/bin/fuchsia_asset_builder.dart
rename to packages/flutter_tools/bin/fuchsia/fuchsia_asset_builder.dart
diff --git a/packages/flutter_tools/bin/fuchsia_attach.dart b/packages/flutter_tools/bin/fuchsia/fuchsia_attach.dart
similarity index 100%
rename from packages/flutter_tools/bin/fuchsia_attach.dart
rename to packages/flutter_tools/bin/fuchsia/fuchsia_attach.dart
diff --git a/packages/flutter_tools/bin/fuchsia_tester.dart b/packages/flutter_tools/bin/fuchsia/fuchsia_tester.dart
similarity index 100%
rename from packages/flutter_tools/bin/fuchsia_tester.dart
rename to packages/flutter_tools/bin/fuchsia/fuchsia_tester.dart
