Update paths to Fuchsia libraries (flutter#4147)

These libraries are in Topaz now.
mnordine · Sep 27, 2017 · 160a98c · 160a98c
1 parent 45b11f7
commit 160a98c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/build/flutter_app.gni b/build/flutter_app.gni
@@ -6,9 +6,9 @@ assert(is_fuchsia)
 
 import("//build/dart/dart_package.gni")
 import("//flutter/lib/ui/dart_ui.gni")
-import("//garnet/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
-import("//garnet/public/dart-pkg/fuchsia/sdk_ext.gni")
-import("//garnet/public/dart-pkg/zircon/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")
 
 declare_args() {
   flutter_app_default_is_jit = true

diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn
@@ -44,13 +44,6 @@ template("flutter_content_handler") {
     ]
 
     deps = [
-             "//garnet/public/lib/app/cpp",
-             "//garnet/public/lib/svc/cpp",
-             "//garnet/public/lib/ui/flutter/sdk_ext",
-             "//garnet/public/lib/ui/scenic:client",
-             "//garnet/public/lib/ui/input/fidl",
-             "//garnet/public/lib/ui/views/fidl",
-             "//peridot/public/lib/context/fidl",
              "//dart/runtime/bin:libdart_builtin",
              "//dart/runtime/platform:libdart_platform",
              "//flutter/assets",
@@ -61,16 +54,23 @@ template("flutter_content_handler") {
              "//flutter/runtime",
              "//flutter/sky/engine/platform",
              "//flutter/vulkan",
-             "//garnet/public/lib/vulkan",
-             "//garnet/public/dart-pkg/fuchsia",
+             "//garnet/public/lib/app/cpp",
+             "//garnet/public/lib/fsl",
              "//garnet/public/lib/fxl",
              "//garnet/public/lib/icu_data/cpp",
-             "//garnet/public/lib/fsl",
+             "//garnet/public/lib/svc/cpp",
+             "//garnet/public/lib/ui/input/fidl",
+             "//garnet/public/lib/ui/scenic:client",
+             "//garnet/public/lib/ui/views/fidl",
+             "//garnet/public/lib/vulkan",
              "//garnet/public/lib/zip",
-             "//zircon/system/ulib/trace-provider",
+             "//peridot/public/lib/context/fidl",
              "//third_party/rapidjson",
              "//third_party/skia",
              "//topaz/lib/tonic",
+             "//topaz/public/dart-pkg/fuchsia",
+             "//topaz/public/lib/ui/flutter/sdk_ext",
+             "//zircon/system/ulib/trace-provider",
            ] + extra_deps
 
     # The flags below are needed so that Dart's CPU profiler can walk the

diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -72,9 +72,9 @@ source_set("flow") {
     ]
 
     deps += [
-      "//garnet/public/dart-pkg/zircon",
       "//garnet/public/lib/ui/scenic:client",
       "//garnet/public/lib/ui/scenic/fidl",
+      "//topaz/public/dart-pkg/zircon",
     ]
 
     public_deps += [ "//zircon/system/ulib/zx" ]

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -19,9 +19,9 @@ import("//dart/runtime/lib/typed_data_sources.gni")
 import("//dart/utils/generate_patch_sdk.gni")
 
 if (is_fuchsia) {
-  import("//garnet/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
-  import("//garnet/public/dart-pkg/fuchsia/sdk_ext.gni")
-  import("//garnet/public/dart-pkg/zircon/sdk_ext.gni")
+  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")
 }
 
 bindings_output_dir = "$root_gen_dir/sky/bindings"
@@ -37,8 +37,8 @@ copy("generate_dart_ui") {
 if (is_fuchsia) {
   action("generate_package_map") {
     dart_deps = [
-      "//garnet/public/lib/app/dart:dart",
-      "//garnet/public/lib/fidl/dart",
+      "//topaz/public/lib/app/dart:dart",
+      "//topaz/public/lib/fidl/dart",
       "//lib/flutter/packages/flutter:flutter",
     ]
 

diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -99,6 +99,6 @@ source_set("ui") {
     "//topaz/lib/tonic",
   ]
   if (is_fuchsia) {
-    deps += [ "//garnet/public/dart-pkg/zircon" ]
+    deps += [ "//topaz/public/dart-pkg/zircon" ]
   }
 }
diff --git a/lib/ui/compositing.dart b/lib/ui/compositing.dart
@@ -273,7 +273,7 @@ class SceneHost extends NativeFieldWrapperClass2 {
   ///
   /// The export token is a dart:zircon Handle, but that type isn't
   /// available here. This is called by ChildViewConnection in
-  /// //garnet/public/lib/ui/flutter/.
+  /// //topaz/public/lib/ui/flutter/.
   ///
   /// The scene host takes ownership of the provided export token handle.
   SceneHost(dynamic export_token_handle) {