Update paths for //application move (flutter#4085)

agd · Sep 11, 2017 · 2a13951 · 2a13951
1 parent a44146f
commit 2a13951
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 78 deletions.
diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn
@@ -42,8 +42,8 @@ template("flutter_content_handler") {
     ]
 
     deps = [
-             "//application/lib/app",
-             "//application/lib/svc",
+             "//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",

diff --git a/content_handler/app.h b/content_handler/app.h
@@ -8,8 +8,8 @@
 #include <memory>
 #include <unordered_set>
 
-#include "application/lib/app/application_context.h"
-#include "application/services/application_runner.fidl.h"
+#include "lib/app/cpp/application_context.h"
+#include "lib/app/fidl/application_runner.fidl.h"
 #include "flutter/content_handler/application_controller_impl.h"
 #include "lib/ftl/macros.h"
 #include "lib/ftl/synchronization/waitable_event.h"

diff --git a/content_handler/application_controller_impl.cc b/content_handler/application_controller_impl.cc
@@ -9,7 +9,7 @@
 #include <magenta/status.h>
 #include <mxio/namespace.h>
 
-#include "application/lib/app/connect.h"
+#include "lib/app/cpp/connect.h"
 #include "flutter/content_handler/app.h"
 #include "flutter/content_handler/runtime_holder.h"
 #include "lib/ftl/logging.h"

diff --git a/content_handler/application_controller_impl.h b/content_handler/application_controller_impl.h
@@ -9,10 +9,10 @@
 
 #include <mxio/namespace.h>
 
-#include "application/lib/svc/service_provider_bridge.h"
-#include "application/services/application_controller.fidl.h"
-#include "application/services/application_runner.fidl.h"
-#include "application/services/service_provider.fidl.h"
+#include "lib/svc/cpp/service_provider_bridge.h"
+#include "lib/app/fidl/application_controller.fidl.h"
+#include "lib/app/fidl/application_runner.fidl.h"
+#include "lib/app/fidl/service_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"

diff --git a/content_handler/runtime_holder.cc b/content_handler/runtime_holder.cc
@@ -9,7 +9,7 @@
 #include <mxio/namespace.h>
 #include <utility>
 
-#include "application/lib/app/connect.h"
+#include "lib/app/cpp/connect.h"
 #include "dart/runtime/include/dart_api.h"
 #include "flutter/assets/zip_asset_store.h"
 #include "flutter/common/threads.h"

diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h
@@ -10,9 +10,9 @@
 
 #include <unordered_set>
 
-#include "application/lib/app/application_context.h"
-#include "application/services/application_environment.fidl.h"
-#include "application/services/service_provider.fidl.h"
+#include "lib/app/cpp/application_context.h"
+#include "lib/app/fidl/application_environment.fidl.h"
+#include "lib/app/fidl/service_provider.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"

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -37,7 +37,7 @@ copy("generate_dart_ui") {
 if (is_fuchsia) {
   action("generate_package_map") {
     dart_deps = [
-      "//application/lib/app/dart:dart",
+      "//garnet/public/lib/app/dart:dart",
       "//garnet/public/lib/fidl/dart",
       "//lib/flutter/packages/flutter:flutter",
     ]

diff --git a/lib/snapshot/fuchsia_compilation_trace.txt b/lib/snapshot/fuchsia_compilation_trace.txt
@@ -4077,69 +4077,69 @@ package:lib.fidl.dart/core.dart,::,get:MX_OBJECT_SIGNAL_0
 package:lib.fidl.dart/core.dart,::,get:MX_OBJECT_SIGNAL_2
 package:lib.fidl.dart/core.dart,::,get:MX_SIGNAL_READABLE
 package:lib.fidl.dart/core.dart,::,get:MX_SIGNAL_PEER_CLOSED
-package:application.lib.app.dart/app.dart,ApplicationContext,ApplicationContext.
-package:application.lib.app.dart/app.dart,ApplicationContext,get:environment
-package:application.lib.app.dart/app.dart,ApplicationContext,get:launcher
-package:application.lib.app.dart/app.dart,ApplicationContext,get:environmentServices
-package:application.lib.app.dart/app.dart,ApplicationContext,get:outgoingServices
-package:application.lib.app.dart/app.dart,ApplicationContext,ApplicationContext.fromStartupInfo
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,get:_binding
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,bind
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,get:_connectors
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,addServiceForName
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,connectToService
-package:application.lib.app.dart/app.dart,ServiceProviderImpl,ServiceProviderImpl.
-package:application.lib.app.dart/app.dart,::,connectToService
-package:application.services/application_environment.fidl.dart,ApplicationEnvironmentProxy,ApplicationEnvironmentProxy.
-package:application.services/application_environment.fidl.dart,ApplicationEnvironmentProxy,getApplicationLauncher
-package:application.services/application_environment.fidl.dart,ApplicationEnvironmentProxy,getServices
-package:application.services/application_environment.fidl.dart,ApplicationEnvironmentProxy,get:_handleResponse
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,get:kVersions
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,get:services
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,set:services
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,_ApplicationEnvironmentGetServicesParams.
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,encode
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,get:kVersions
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,get:launcher
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,set:launcher
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,_ApplicationEnvironmentGetApplicationLauncherParams.
-package:application.services/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,encode
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:kVersions
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:serviceName_
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,set:serviceName_
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:channel
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,set:channel
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,_ServiceProviderConnectToServiceParams.
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,deserialize
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,decode
-package:application.services/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,encode
-package:application.services/service_provider.fidl.dart,ServiceProviderBinding,handleMessage
-package:application.services/service_provider.fidl.dart,ServiceProviderBinding,ServiceProviderBinding.
-package:application.services/service_provider.fidl.dart,ServiceProvider,ServiceProvider.
-package:application.services/service_provider.fidl.dart,ServiceProviderProxy,ServiceProviderProxy.
-package:application.services/service_provider.fidl.dart,ServiceProviderProxy,connectToService
-package:application.services/service_provider.fidl.dart,ServiceProviderProxy,get:_handleResponse
-package:application.services/application_launcher.fidl.dart,ApplicationLauncherProxy,ApplicationLauncherProxy.
-package:application.services/application_launcher.fidl.dart,ApplicationLauncherProxy,createApplication
-package:application.services/application_launcher.fidl.dart,ApplicationLauncherProxy,get:_handleResponse
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,get:kVersions
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,get:url
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,set:url
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,get:arguments
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,get:serviceRequest
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,get:services
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,set:services
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,ApplicationLaunchInfo.
-package:application.services/application_launcher.fidl.dart,ApplicationLaunchInfo,encode
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:kVersions
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:launchInfo
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,set:launchInfo
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:controller
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,set:controller
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,_ApplicationLauncherCreateApplicationParams.
-package:application.services/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,encode
-package:application.services/application_controller.fidl.dart,ApplicationControllerProxy,ApplicationControllerProxy.
-package:application.services/application_controller.fidl.dart,ApplicationControllerProxy,get:_handleResponse
+package:lib.app.dart/app.dart,ApplicationContext,ApplicationContext.
+package:lib.app.dart/app.dart,ApplicationContext,get:environment
+package:lib.app.dart/app.dart,ApplicationContext,get:launcher
+package:lib.app.dart/app.dart,ApplicationContext,get:environmentServices
+package:lib.app.dart/app.dart,ApplicationContext,get:outgoingServices
+package:lib.app.dart/app.dart,ApplicationContext,ApplicationContext.fromStartupInfo
+package:lib.app.dart/app.dart,ServiceProviderImpl,get:_binding
+package:lib.app.dart/app.dart,ServiceProviderImpl,bind
+package:lib.app.dart/app.dart,ServiceProviderImpl,get:_connectors
+package:lib.app.dart/app.dart,ServiceProviderImpl,addServiceForName
+package:lib.app.dart/app.dart,ServiceProviderImpl,connectToService
+package:lib.app.dart/app.dart,ServiceProviderImpl,ServiceProviderImpl.
+package:lib.app.dart/app.dart,::,connectToService
+package:lib.app.fidl/application_environment.fidl.dart,ApplicationEnvironmentProxy,ApplicationEnvironmentProxy.
+package:lib.app.fidl/application_environment.fidl.dart,ApplicationEnvironmentProxy,getApplicationLauncher
+package:lib.app.fidl/application_environment.fidl.dart,ApplicationEnvironmentProxy,getServices
+package:lib.app.fidl/application_environment.fidl.dart,ApplicationEnvironmentProxy,get:_handleResponse
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,get:kVersions
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,get:services
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,set:services
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,_ApplicationEnvironmentGetServicesParams.
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetServicesParams,encode
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,get:kVersions
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,get:launcher
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,set:launcher
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,_ApplicationEnvironmentGetApplicationLauncherParams.
+package:lib.app.fidl/application_environment.fidl.dart,_ApplicationEnvironmentGetApplicationLauncherParams,encode
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:kVersions
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:serviceName_
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,set:serviceName_
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,get:channel
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,set:channel
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,_ServiceProviderConnectToServiceParams.
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,deserialize
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,decode
+package:lib.app.fidl/service_provider.fidl.dart,_ServiceProviderConnectToServiceParams,encode
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProviderBinding,handleMessage
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProviderBinding,ServiceProviderBinding.
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProvider,ServiceProvider.
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProviderProxy,ServiceProviderProxy.
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProviderProxy,connectToService
+package:lib.app.fidl/service_provider.fidl.dart,ServiceProviderProxy,get:_handleResponse
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLauncherProxy,ApplicationLauncherProxy.
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLauncherProxy,createApplication
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLauncherProxy,get:_handleResponse
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,get:kVersions
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,get:url
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,set:url
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,get:arguments
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,get:serviceRequest
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,get:services
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,set:services
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,ApplicationLaunchInfo.
+package:lib.app.fidl/application_launcher.fidl.dart,ApplicationLaunchInfo,encode
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:kVersions
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:launchInfo
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,set:launchInfo
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,get:controller
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,set:controller
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,_ApplicationLauncherCreateApplicationParams.
+package:lib.app.fidl/application_launcher.fidl.dart,_ApplicationLauncherCreateApplicationParams,encode
+package:lib.app.fidl/application_controller.fidl.dart,ApplicationControllerProxy,ApplicationControllerProxy.
+package:lib.app.fidl/application_controller.fidl.dart,ApplicationControllerProxy,get:_handleResponse
 package:lib.modular/src/modular/device_shell_impl.dart,DeviceShellImpl,get:_deviceShellContextProxy
 package:lib.modular/src/modular/device_shell_impl.dart,DeviceShellImpl,get:_userProviderProxy
 package:lib.modular/src/modular/device_shell_impl.dart,DeviceShellImpl,get:onReady

diff --git a/lib/snapshot/snapshot_fuchsia.dart b/lib/snapshot/snapshot_fuchsia.dart
@@ -21,7 +21,7 @@ import 'dart:zircon';
 // These libraries are optional. They are included in the core snapshot and
 // partially compiled to avoid repeating them in each application and improve
 // startup time.
-import 'package:application.lib.app.dart/app.dart';
+import 'package:lib.app.dart/app.dart';
 import 'package:flutter/animation.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';