Unverified Commit ffcc7765 authored by George Wright's avatar George Wright Committed by GitHub

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
parent 4ccf7424
...@@ -56,7 +56,8 @@ dart_library("flutter_tools") { ...@@ -56,7 +56,8 @@ dart_library("flutter_tools") {
} }
dart_tool("fuchsia_builder") { dart_tool("fuchsia_builder") {
main_dart = "bin/fuchsia_builder.dart" main_dart = "bin/fuchsia/fuchsia_builder.dart"
source_dir = "bin/fuchsia"
disable_analysis = true disable_analysis = true
...@@ -66,7 +67,8 @@ dart_tool("fuchsia_builder") { ...@@ -66,7 +67,8 @@ dart_tool("fuchsia_builder") {
} }
dart_tool("fuchsia_asset_builder") { 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 disable_analysis = true
...@@ -152,7 +154,8 @@ dart_tool("fuchsia_asset_builder") { ...@@ -152,7 +154,8 @@ dart_tool("fuchsia_asset_builder") {
} }
dart_tool("fuchsia_tester") { dart_tool("fuchsia_tester") {
main_dart = "bin/fuchsia_tester.dart" main_dart = "bin/fuchsia/fuchsia_tester.dart"
source_dir = "bin/fuchsia"
disable_analysis = true disable_analysis = true
...@@ -247,7 +250,8 @@ dart_tool("fuchsia_tester") { ...@@ -247,7 +250,8 @@ dart_tool("fuchsia_tester") {
dart_tool("fuchsia_attach") { dart_tool("fuchsia_attach") {
package_name = "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. # Can be left empty as analysis is disabled.
sources = [] sources = []
......
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