Update the location of Flutter packages. (flutter#4257)

mnordine · Oct 20, 2017 · 419ee7c · 419ee7c
1 parent 90f4664
commit 419ee7c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build/flutter_app.gni b/build/flutter_app.gni
@@ -18,7 +18,7 @@ gen_snapshot_label = "//third_party/dart/runtime/bin:gen_snapshot($host_toolchai
 gen_snapshot_dir = get_label_info(gen_snapshot_label, "root_out_dir")
 gen_snapshot = "$gen_snapshot_dir/gen_snapshot"
 
-flutter_base = "//lib/flutter"
+flutter_base = "//third_party/dart-pkg/git/flutter"
 flutter_tools_label =
     "$flutter_base/packages/flutter_tools:fuchsia_builder($host_toolchain)"
 flutter_tools_out_dir = get_label_info(flutter_tools_label, "root_out_dir")

diff --git a/examples/hello_flutter/BUILD.gn b/examples/hello_flutter/BUILD.gn
@@ -10,7 +10,7 @@ flutter_jit_app("hello_flutter") {
   disable_analysis = true
 
   deps = [
-    "//lib/flutter/packages/flutter",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
   ]
 }
 
@@ -20,6 +20,6 @@ flutter_aot_app("hello_flutter_aot") {
   disable_analysis = true
 
   deps = [
-    "//lib/flutter/packages/flutter",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
   ]
 }
diff --git a/examples/spinning_square/BUILD.gn b/examples/spinning_square/BUILD.gn
@@ -10,6 +10,6 @@ flutter_app("spinning_square") {
   disable_analysis = true
 
   deps = [
-    "//lib/flutter/packages/flutter",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
   ]
 }
diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -19,9 +19,9 @@ import("//third_party/dart/runtime/lib/typed_data_sources.gni")
 import("//third_party/dart/utils/generate_patch_sdk.gni")
 
 if (is_fuchsia) {
-  import("//topaz/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
   import("//topaz/public/dart-pkg/fuchsia/sdk_ext.gni")
   import("//topaz/public/dart-pkg/zircon/sdk_ext.gni")
+  import("//topaz/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
 }
 
 bindings_output_dir = "$root_gen_dir/sky/bindings"
@@ -37,9 +37,9 @@ copy("generate_dart_ui") {
 if (is_fuchsia) {
   action("generate_package_map") {
     dart_deps = [
+      "//third_party/dart-pkg/git/flutter/packages/flutter:flutter",
       "//topaz/public/lib/app/dart:dart",
       "//topaz/public/lib/fidl/dart",
-      "//lib/flutter/packages/flutter:flutter",
     ]
 
     dot_packages_file = "$target_gen_dir/snapshot.packages"