Update paths for Mozart move (flutter#4081)

xingnan · Sep 8, 2017 · 457f92b · 457f92b
1 parent 64ac5e8
commit 457f92b
Show file tree

Hide file tree

Showing 17 changed files with 171 additions and 171 deletions.
diff --git a/build/flutter_app.gni b/build/flutter_app.gni
@@ -6,7 +6,7 @@ assert(is_fuchsia)
 
 import("//build/dart/dart_package.gni")
 import("//flutter/lib/ui/dart_ui.gni")
-import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.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")
 

diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn
@@ -44,10 +44,10 @@ template("flutter_content_handler") {
     deps = [
              "//application/lib/app",
              "//application/lib/svc",
-             "//apps/mozart/lib/flutter/sdk_ext",
-             "//apps/mozart/lib/scenic:client",
-             "//apps/mozart/services/input",
-             "//apps/mozart/services/views",
+             "//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",
              "//dart/runtime/bin:libdart_builtin",
              "//dart/runtime/platform:libdart_platform",
              "//flutter/assets",

diff --git a/content_handler/application_controller_impl.h b/content_handler/application_controller_impl.h
@@ -13,7 +13,7 @@
 #include "application/services/application_controller.fidl.h"
 #include "application/services/application_runner.fidl.h"
 #include "application/services/service_provider.fidl.h"
-#include "apps/mozart/services/views/view_provider.fidl.h"
+#include "lib/ui/views/fidl/view_provider.fidl.h"
 #include "dart/runtime/include/dart_api.h"
 #include "lib/fidl/cpp/bindings/binding.h"
 #include "lib/fidl/cpp/bindings/binding_set.h"

diff --git a/content_handler/rasterizer.h b/content_handler/rasterizer.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "apps/mozart/services/scenic/session.fidl.h"
+#include "lib/ui/scenic/fidl/session.fidl.h"
 #include "flutter/flow/layers/layer_tree.h"
 #include "lib/ftl/functional/closure.h"
 #include "lib/ftl/macros.h"

diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h
@@ -13,10 +13,10 @@
 #include "application/lib/app/application_context.h"
 #include "application/services/application_environment.fidl.h"
 #include "application/services/service_provider.fidl.h"
-#include "apps/mozart/lib/flutter/sdk_ext/src/natives.h"
-#include "apps/mozart/services/input/input_connection.fidl.h"
-#include "apps/mozart/services/input/text_input.fidl.h"
-#include "apps/mozart/services/views/view_manager.fidl.h"
+#include "lib/ui/flutter/sdk_ext/src/natives.h"
+#include "lib/ui/input/fidl/input_connection.fidl.h"
+#include "lib/ui/input/fidl/text_input.fidl.h"
+#include "lib/ui/views/fidl/view_manager.fidl.h"
 #include "dart-pkg/fuchsia/sdk_ext/fuchsia.h"
 #include "flutter/assets/unzipper_provider.h"
 #include "flutter/assets/zip_asset_store.h"

diff --git a/content_handler/session_connection.cc b/content_handler/session_connection.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/content_handler/session_connection.h"
-#include "apps/mozart/lib/scenic/fidl_helpers.h"
+#include "lib/ui/scenic/fidl_helpers.h"
 
 namespace flutter_runner {
 

diff --git a/content_handler/session_connection.h b/content_handler/session_connection.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_CONTENT_HANDLER_SESSION_CONNECTION_H_
 #define FLUTTER_CONTENT_HANDLER_SESSION_CONNECTION_H_
 
-#include "apps/mozart/lib/scenic/client/resources.h"
-#include "apps/mozart/lib/scenic/client/session.h"
+#include "lib/ui/scenic/client/resources.h"
+#include "lib/ui/scenic/client/session.h"
 #include "flutter/common/threads.h"
 #include "flutter/content_handler/vulkan_surface_producer.h"
 #include "flutter/flow/compositor_context.h"

diff --git a/content_handler/vulkan_surface.h b/content_handler/vulkan_surface.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "apps/mozart/lib/scenic/client/resources.h"
+#include "lib/ui/scenic/client/resources.h"
 #include "flutter/flow/scene_update_context.h"
 #include "flutter/vulkan/vulkan_handle.h"
 #include "flutter/vulkan/vulkan_proc_table.h"

diff --git a/content_handler/vulkan_surface_producer.h b/content_handler/vulkan_surface_producer.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_CONTENT_HANDLER_VULKAN_SURFACE_PRODUCER_H_
 #define FLUTTER_CONTENT_HANDLER_VULKAN_SURFACE_PRODUCER_H_
 
-#include "apps/mozart/lib/scenic/client/resources.h"
-#include "apps/mozart/lib/scenic/client/session.h"
+#include "lib/ui/scenic/client/resources.h"
+#include "lib/ui/scenic/client/session.h"
 #include "flutter/content_handler/vulkan_surface.h"
 #include "flutter/content_handler/vulkan_surface_pool.h"
 #include "flutter/flow/scene_update_context.h"

diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -72,8 +72,8 @@ source_set("flow") {
     ]
 
     deps += [
-      "//apps/mozart/lib/scenic:client",
-      "//apps/mozart/services/scenic",
+      "//garnet/public/lib/ui/scenic:client",
+      "//garnet/public/lib/ui/scenic/fidl",
       "//garnet/public/dart-pkg/zircon",
     ]
 

diff --git a/flow/export_node.h b/flow/export_node.h
@@ -9,7 +9,7 @@
 
 #include <mx/eventpair.h>
 
-#include "apps/mozart/lib/scenic/client/resources.h"
+#include "lib/ui/scenic/client/resources.h"
 #include "flutter/flow/scene_update_context.h"
 #include "dart-pkg/zircon/sdk_ext/handle.h"
 #include "lib/ftl/build_config.h"

diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
@@ -6,7 +6,7 @@
 
 #if defined(OS_FUCHSIA)
 
-#include "apps/mozart/lib/scenic/fidl_helpers.h"  // nogncheck
+#include "lib/ui/scenic/fidl_helpers.h"  // nogncheck
 
 #endif  // defined(OS_FUCHSIA)
 

diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -25,8 +25,8 @@
 
 #if defined(OS_FUCHSIA)
 
-#include "apps/mozart/lib/scenic/client/resources.h"  //nogncheck
-#include "apps/mozart/lib/scenic/client/session.h"    //nogncheck
+#include "lib/ui/scenic/client/resources.h"  //nogncheck
+#include "lib/ui/scenic/client/session.h"    //nogncheck
 #include "flutter/flow/scene_update_context.h"       //nogncheck
 
 #endif  // defined(OS_FUCHSIA)

diff --git a/flow/scene_update_context.h b/flow/scene_update_context.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <vector>
 
-#include "apps/mozart/lib/scenic/client/resources.h"
+#include "lib/ui/scenic/client/resources.h"
 #include "flutter/flow/compositor_context.h"
 #include "lib/ftl/build_config.h"
 #include "lib/ftl/logging.h"

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -19,7 +19,7 @@ import("//dart/runtime/lib/typed_data_sources.gni")
 import("//dart/utils/generate_patch_sdk.gni")
 
 if (is_fuchsia) {
-  import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.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")
 }