[modular][fuchsia.git] Move other //peridot/lib targets to //src/modular/lib
What's left in //peridot/lib is used by more clients including:
//src/ledger and //src/identity.
Change-Id: I1e51db999be44dc4e45fc22dd2c0aad621f506d5
diff --git a/peridot/bin/agents/clipboard/BUILD.gn b/peridot/bin/agents/clipboard/BUILD.gn
index 8bfab0a..29df8a1 100644
--- a/peridot/bin/agents/clipboard/BUILD.gn
+++ b/peridot/bin/agents/clipboard/BUILD.gn
@@ -45,11 +45,11 @@
]
deps = [
- "//peridot/lib/fidl:array_to_string",
"//peridot/lib/ledger_client:page_client",
"//sdk/fidl/fuchsia.modular",
"//sdk/lib/fidl/cpp",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
]
}
@@ -63,9 +63,9 @@
deps = [
":clipboard_sources",
"//garnet/public/lib/gtest",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_ledger",
]
}
diff --git a/peridot/bin/agents/clipboard/clipboard_impl.cc b/peridot/bin/agents/clipboard/clipboard_impl.cc
index 1bfadf3..d4feba9 100644
--- a/peridot/bin/agents/clipboard/clipboard_impl.cc
+++ b/peridot/bin/agents/clipboard/clipboard_impl.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "peridot/lib/fidl/array_to_string.h"
#include "peridot/lib/ledger_client/page_id.h"
+#include "src/modular/lib/fidl/array_to_string.h"
namespace modular {
namespace {
diff --git a/peridot/bin/agents/clipboard/clipboard_impl_unittest.cc b/peridot/bin/agents/clipboard/clipboard_impl_unittest.cc
index cdd0874..a5f9b38 100644
--- a/peridot/bin/agents/clipboard/clipboard_impl_unittest.cc
+++ b/peridot/bin/agents/clipboard/clipboard_impl_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
-#include "peridot/lib/testing/test_with_ledger.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
diff --git a/peridot/bin/basemgr/BUILD.gn b/peridot/bin/basemgr/BUILD.gn
index 61a34c4..590e8b0 100644
--- a/peridot/bin/basemgr/BUILD.gn
+++ b/peridot/bin/basemgr/BUILD.gn
@@ -38,15 +38,8 @@
"//garnet/public/lib/json",
"//peridot/bin/agents/clipboard:clipboard_sources",
"//peridot/bin/basemgr/cobalt",
- "//peridot/lib/common:async_holder",
- "//peridot/lib/common:teardown",
- "//peridot/lib/fidl:app_client",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/fidl:environment",
"//peridot/lib/ledger_client:constants",
"//peridot/lib/ledger_client:page_client",
- "//peridot/lib/modular_config:modular_config",
"//peridot/lib/rapidjson",
"//sdk/fidl/fuchsia.auth",
"//sdk/fidl/fuchsia.auth.account",
@@ -65,6 +58,13 @@
"//sdk/lib/ui/scenic/cpp",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:future",
+ "//src/modular/lib/common:async_holder",
+ "//src/modular/lib/common:teardown",
+ "//src/modular/lib/fidl:app_client",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/fidl:environment",
+ "//src/modular/lib/modular_config:modular_config",
"//zircon/public/fidl/fuchsia-device-manager",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/trace-provider-with-fdio",
@@ -112,14 +112,6 @@
deps = [
"//garnet/public/lib/fsl",
- "//peridot/lib/common:async_holder",
- "//peridot/lib/common:teardown",
- "//peridot/lib/fidl:app_client",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/fidl:environment",
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/modular_config",
"//sdk/fidl/fuchsia.modular.session",
"//sdk/fidl/fuchsia.sys",
"//sdk/fidl/fuchsia.ui.gfx",
@@ -129,6 +121,14 @@
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:future",
+ "//src/modular/lib/common:async_holder",
+ "//src/modular/lib/common:teardown",
+ "//src/modular/lib/fidl:app_client",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/fidl:environment",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/modular_config",
"//zircon/public/fidl/fuchsia-device-manager",
"//zircon/public/lib/trace",
]
@@ -161,12 +161,12 @@
deps = [
"//garnet/public/lib/callback",
- "//peridot/lib/fidl:single_service_app",
"//sdk/fidl/fuchsia.auth.account",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.views",
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
"//src/modular/lib/integration_testing/cpp",
"//zircon/public/lib/async-loop-cpp",
]
@@ -181,12 +181,12 @@
deps = [
"//garnet/public/lib/callback",
- "//peridot/lib/fidl:single_service_app",
"//sdk/fidl/fuchsia.auth.account",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.views",
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -254,12 +254,12 @@
":lib",
"//garnet/public/lib/fsl",
"//garnet/public/lib/gtest",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/fidl:environment",
"//sdk/lib/sys/cpp",
"//sdk/lib/sys/cpp/testing:unit",
"//src/lib/fxl",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/fidl:environment",
]
}
diff --git a/peridot/bin/basemgr/auto_login_base_shell.cc b/peridot/bin/basemgr/auto_login_base_shell.cc
index 4fdc84e..30131d4 100644
--- a/peridot/bin/basemgr/auto_login_base_shell.cc
+++ b/peridot/bin/basemgr/auto_login_base_shell.cc
@@ -22,8 +22,8 @@
#include <src/lib/fxl/macros.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/fidl/single_service_app.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
namespace modular {
diff --git a/peridot/bin/basemgr/basemgr_impl.cc b/peridot/bin/basemgr/basemgr_impl.cc
index 145eb87..4d9b189 100644
--- a/peridot/bin/basemgr/basemgr_impl.cc
+++ b/peridot/bin/basemgr/basemgr_impl.cc
@@ -9,16 +9,17 @@
#include <lib/fidl/cpp/type_converter.h>
#include <lib/fsl/types/type_converters.h>
#include <lib/ui/scenic/cpp/view_token_pair.h>
+
#include <src/lib/fxl/logging.h>
#include "peridot/bin/basemgr/basemgr_settings.h"
#include "peridot/bin/basemgr/noop_clipboard_impl.h"
#include "peridot/bin/basemgr/session_provider.h"
#include "peridot/bin/basemgr/wait_for_minfs.h"
-#include "peridot/lib/common/async_holder.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/app_client.h"
-#include "peridot/lib/fidl/clone.h"
+#include "src/modular/lib/common/async_holder.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/clone.h"
namespace fidl {
template <>
diff --git a/peridot/bin/basemgr/basemgr_impl.h b/peridot/bin/basemgr/basemgr_impl.h
index 9a3ca9a..760a14b7 100644
--- a/peridot/bin/basemgr/basemgr_impl.h
+++ b/peridot/bin/basemgr/basemgr_impl.h
@@ -32,8 +32,8 @@
#include "peridot/bin/basemgr/presentation_container.h"
#include "peridot/bin/basemgr/session_provider.h"
#include "peridot/bin/basemgr/session_user_provider_impl.h"
-#include "peridot/lib/fidl/clone.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/basemgr/basemgr_settings.cc b/peridot/bin/basemgr/basemgr_settings.cc
index 5a7f3b2..d55fff1 100644
--- a/peridot/bin/basemgr/basemgr_settings.cc
+++ b/peridot/bin/basemgr/basemgr_settings.cc
@@ -4,14 +4,15 @@
#include "peridot/bin/basemgr/basemgr_settings.h"
+#include <lib/fidl/cpp/string.h>
+
#include <string>
-#include <lib/fidl/cpp/string.h>
#include <src/lib/fxl/command_line.h>
#include <src/lib/fxl/macros.h>
-#include "peridot/lib/modular_config/modular_config_constants.h"
#include "src/lib/files/file.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
namespace modular {
diff --git a/peridot/bin/basemgr/dev_base_shell.cc b/peridot/bin/basemgr/dev_base_shell.cc
index 20742fe..e925fa8 100644
--- a/peridot/bin/basemgr/dev_base_shell.cc
+++ b/peridot/bin/basemgr/dev_base_shell.cc
@@ -24,8 +24,8 @@
#include <src/lib/fxl/memory/weak_ptr.h>
#include <src/lib/fxl/strings/string_number_conversions.h>
-#include "peridot/lib/fidl/single_service_app.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
#include "src/modular/lib/integration_testing/cpp/reporting.h"
#include "src/modular/lib/integration_testing/cpp/testing.h"
diff --git a/peridot/bin/basemgr/intl_property_provider_impl/intl_property_provider_impl.cc b/peridot/bin/basemgr/intl_property_provider_impl/intl_property_provider_impl.cc
index 5be05c1..b7be612 100644
--- a/peridot/bin/basemgr/intl_property_provider_impl/intl_property_provider_impl.cc
+++ b/peridot/bin/basemgr/intl_property_provider_impl/intl_property_provider_impl.cc
@@ -6,8 +6,8 @@
#include <iterator>
-#include <peridot/lib/fidl/clone.h>
#include <src/lib/icu_data/cpp/icu_data.h>
+#include <src/modular/lib/fidl/clone.h>
#include "lib/fostr/fidl/fuchsia/intl/formatting.h"
#include "lib/syslog/cpp/logger.h"
diff --git a/peridot/bin/basemgr/main.cc b/peridot/bin/basemgr/main.cc
index 66a4c45e..45e93d7 100644
--- a/peridot/bin/basemgr/main.cc
+++ b/peridot/bin/basemgr/main.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <iostream>
-#include <memory>
-
#include <fuchsia/device/manager/cpp/fidl.h>
#include <fuchsia/modular/internal/cpp/fidl.h>
#include <fuchsia/modular/session/cpp/fidl.h>
@@ -14,6 +11,10 @@
#include <lib/fit/defer.h>
#include <lib/fit/function.h>
#include <lib/sys/cpp/component_context.h>
+
+#include <iostream>
+#include <memory>
+
#include <src/lib/fxl/command_line.h>
#include <src/lib/fxl/macros.h>
#include <trace-provider/provider.h>
@@ -21,8 +22,8 @@
#include "peridot/bin/basemgr/basemgr_impl.h"
#include "peridot/bin/basemgr/basemgr_settings.h"
#include "peridot/bin/basemgr/cobalt/cobalt.h"
-#include "peridot/lib/modular_config/modular_config.h"
-#include "peridot/lib/modular_config/modular_config_constants.h"
+#include "src/modular/lib/modular_config/modular_config.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
namespace {
#ifdef AUTO_LOGIN_TO_GUEST
diff --git a/peridot/bin/basemgr/noop_clipboard_impl.h b/peridot/bin/basemgr/noop_clipboard_impl.h
index 85d3404..18558bd 100644
--- a/peridot/bin/basemgr/noop_clipboard_impl.h
+++ b/peridot/bin/basemgr/noop_clipboard_impl.h
@@ -7,9 +7,10 @@
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
+
#include <src/lib/fxl/macros.h>
-#include "peridot/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/array_to_string.h"
namespace modular {
diff --git a/peridot/bin/basemgr/session_context_impl.cc b/peridot/bin/basemgr/session_context_impl.cc
index 882e192..2ed38fb 100644
--- a/peridot/bin/basemgr/session_context_impl.cc
+++ b/peridot/bin/basemgr/session_context_impl.cc
@@ -12,12 +12,12 @@
#include <string>
#include <utility>
-#include "peridot/lib/common/async_holder.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/modular_config/modular_config_constants.h"
#include "src/lib/files/directory.h"
#include "src/lib/files/unique_fd.h"
+#include "src/modular/lib/common/async_holder.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
namespace modular {
diff --git a/peridot/bin/basemgr/session_context_impl.h b/peridot/bin/basemgr/session_context_impl.h
index d8c8391..ccf97a2 100644
--- a/peridot/bin/basemgr/session_context_impl.h
+++ b/peridot/bin/basemgr/session_context_impl.h
@@ -21,9 +21,9 @@
#include <src/lib/fxl/macros.h>
-#include "peridot/lib/fidl/app_client.h"
-#include "peridot/lib/fidl/environment.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/environment.h"
namespace modular {
diff --git a/peridot/bin/basemgr/session_context_impl_unittest.cc b/peridot/bin/basemgr/session_context_impl_unittest.cc
index a8c1705..ff2d88d 100644
--- a/peridot/bin/basemgr/session_context_impl_unittest.cc
+++ b/peridot/bin/basemgr/session_context_impl_unittest.cc
@@ -9,7 +9,7 @@
#include <lib/gtest/test_loop_fixture.h>
#include <lib/sys/cpp/testing/fake_launcher.h>
-#include "peridot/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
namespace testing {
diff --git a/peridot/bin/basemgr/session_provider.cc b/peridot/bin/basemgr/session_provider.cc
index 0e310792..25a111b 100644
--- a/peridot/bin/basemgr/session_provider.cc
+++ b/peridot/bin/basemgr/session_provider.cc
@@ -9,7 +9,7 @@
#include <zircon/status.h>
#include "peridot/bin/basemgr/session_context_impl.h"
-#include "peridot/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/basemgr/session_user_provider_impl.cc b/peridot/bin/basemgr/session_user_provider_impl.cc
index 9db84a1..dd3fb11 100644
--- a/peridot/bin/basemgr/session_user_provider_impl.cc
+++ b/peridot/bin/basemgr/session_user_provider_impl.cc
@@ -4,13 +4,13 @@
#include "peridot/bin/basemgr/session_user_provider_impl.h"
-#include <utility>
-
#include <lib/fit/function.h>
#include <zircon/status.h>
-#include "peridot/lib/fidl/clone.h"
-#include "peridot/lib/fidl/json_xdr.h"
+#include <utility>
+
+#include "src/modular/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/context_engine/BUILD.gn b/peridot/bin/context_engine/BUILD.gn
index 9767d4e..5ef963e 100644
--- a/peridot/bin/context_engine/BUILD.gn
+++ b/peridot/bin/context_engine/BUILD.gn
@@ -90,10 +90,10 @@
deps = [
":context_index",
"//garnet/public/lib/fsl",
- "//peridot/lib/bound_set",
"//peridot/lib/rapidjson",
- "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular",
+ "//src/modular/lib/bound_set",
+ "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//third_party/rapidjson",
]
}
@@ -127,9 +127,9 @@
deps = [
":context_repository",
- "//peridot/lib/bound_set",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl",
+ "//src/modular/lib/bound_set",
"//src/modular/lib/entity/cpp",
"//src/modular/lib/entity/cpp:json",
"//third_party/rapidjson",
diff --git a/peridot/bin/context_engine/context_writer_impl.h b/peridot/bin/context_engine/context_writer_impl.h
index 9e2a7e5..3966d320 100644
--- a/peridot/bin/context_engine/context_writer_impl.h
+++ b/peridot/bin/context_engine/context_writer_impl.h
@@ -13,8 +13,8 @@
#include <src/lib/fxl/memory/weak_ptr.h>
#include "peridot/bin/context_engine/context_repository.h"
-#include "peridot/lib/bound_set/bound_set.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/bound_set/bound_set.h"
namespace modular {
diff --git a/peridot/bin/modular_test_harness/BUILD.gn b/peridot/bin/modular_test_harness/BUILD.gn
index 3288870..d57818a 100644
--- a/peridot/bin/modular_test_harness/BUILD.gn
+++ b/peridot/bin/modular_test_harness/BUILD.gn
@@ -31,11 +31,11 @@
deps = [
"//garnet/public/lib/callback",
"//garnet/public/lib/fxl",
- "//peridot/lib/fidl:single_service_app",
"//sdk/fidl/fuchsia.auth",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.views",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
"//src/modular/lib/integration_testing/cpp",
"//zircon/public/lib/async-loop-cpp",
]
@@ -50,13 +50,13 @@
deps = [
"//garnet/public/lib/fxl",
- "//peridot/lib/fidl:single_service_app",
- "//peridot/lib/fidl:view_host",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/fidl/fuchsia.ui.views",
"//sdk/lib/fidl/cpp",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
+ "//src/modular/lib/fidl:view_host",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -71,11 +71,11 @@
deps = [
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
- "//peridot/lib/fidl:single_service_app",
- "//peridot/lib/fidl:view_host",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.views",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
+ "//src/modular/lib/fidl:view_host",
"//zircon/public/lib/async-loop-cpp",
]
}
diff --git a/peridot/bin/modular_test_harness/test_base_shell.cc b/peridot/bin/modular_test_harness/test_base_shell.cc
index 8aae300..7b59a4d 100644
--- a/peridot/bin/modular_test_harness/test_base_shell.cc
+++ b/peridot/bin/modular_test_harness/test_base_shell.cc
@@ -13,8 +13,8 @@
#include <src/lib/fxl/logging.h>
-#include "peridot/lib/fidl/single_service_app.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
namespace modular {
namespace {
diff --git a/peridot/bin/modular_test_harness/test_session_shell.cc b/peridot/bin/modular_test_harness/test_session_shell.cc
index 004298f6..0739e2b 100644
--- a/peridot/bin/modular_test_harness/test_session_shell.cc
+++ b/peridot/bin/modular_test_harness/test_session_shell.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <utility>
-#include "peridot/lib/fidl/single_service_app.h"
-#include "peridot/lib/fidl/view_host.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
+#include "src/modular/lib/fidl/view_host.h"
namespace {
diff --git a/peridot/bin/modular_test_harness/test_story_shell.cc b/peridot/bin/modular_test_harness/test_story_shell.cc
index 21b2d51..21e4208 100644
--- a/peridot/bin/modular_test_harness/test_story_shell.cc
+++ b/peridot/bin/modular_test_harness/test_story_shell.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "peridot/lib/fidl/single_service_app.h"
-#include "peridot/lib/fidl/view_host.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
+#include "src/modular/lib/fidl/view_host.h"
namespace {
diff --git a/peridot/bin/module_resolver/BUILD.gn b/peridot/bin/module_resolver/BUILD.gn
index 904eb0fc..9046621 100644
--- a/peridot/bin/module_resolver/BUILD.gn
+++ b/peridot/bin/module_resolver/BUILD.gn
@@ -21,14 +21,14 @@
deps = [
":local_module_resolver",
- "//peridot/lib/module_manifest_source:firebase_source",
- "//peridot/lib/module_manifest_source:module_package_source",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.net.oldhttp",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp:app_driver",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/module_manifest_source:firebase_source",
+ "//src/modular/lib/module_manifest_source:module_package_source",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -47,13 +47,13 @@
]
deps = [
- "//peridot/lib/fidl:clone",
- "//peridot/lib/module_manifest_source",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
"//src/modular/lib/context/cpp:context_helper",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/module_manifest_source",
]
}
@@ -68,10 +68,10 @@
":local_module_resolver",
"//garnet/public/lib/fsl",
"//garnet/public/lib/gtest",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/testing:entity_resolver_fake",
"//src/lib/fxl",
"//src/lib/fxl/test:gtest_main",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/testing:entity_resolver_fake",
]
}
diff --git a/peridot/bin/module_resolver/local_module_resolver.cc b/peridot/bin/module_resolver/local_module_resolver.cc
index c72fba9..97e5cc4 100644
--- a/peridot/bin/module_resolver/local_module_resolver.cc
+++ b/peridot/bin/module_resolver/local_module_resolver.cc
@@ -12,9 +12,9 @@
#include <src/lib/fxl/strings/split_string.h>
-#include "peridot/lib/fidl/clone.h"
#include "src/modular/lib/context/cpp/context_helper.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
namespace {
diff --git a/peridot/bin/module_resolver/local_module_resolver.h b/peridot/bin/module_resolver/local_module_resolver.h
index 194e6e4..cbb5426 100644
--- a/peridot/bin/module_resolver/local_module_resolver.h
+++ b/peridot/bin/module_resolver/local_module_resolver.h
@@ -15,8 +15,8 @@
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/module_manifest_source/module_manifest_source.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/module_manifest_source/module_manifest_source.h"
namespace modular {
diff --git a/peridot/bin/module_resolver/local_module_resolver_unittest.cc b/peridot/bin/module_resolver/local_module_resolver_unittest.cc
index 7d3d2c0..4b94af1 100644
--- a/peridot/bin/module_resolver/local_module_resolver_unittest.cc
+++ b/peridot/bin/module_resolver/local_module_resolver_unittest.cc
@@ -7,10 +7,10 @@
#include <lib/fsl/types/type_converters.h>
#include <lib/gtest/test_loop_fixture.h>
-#include "peridot/lib/fidl/clone.h"
-#include "peridot/lib/testing/entity_resolver_fake.h"
#include "src/lib/files/file.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/clone.h"
+#include "src/modular/lib/testing/entity_resolver_fake.h"
namespace modular {
namespace {
diff --git a/peridot/bin/module_resolver/module_package_indexer/BUILD.gn b/peridot/bin/module_resolver/module_package_indexer/BUILD.gn
index b738dd8..0c9ed3d 100644
--- a/peridot/bin/module_resolver/module_package_indexer/BUILD.gn
+++ b/peridot/bin/module_resolver/module_package_indexer/BUILD.gn
@@ -12,9 +12,9 @@
]
deps = [
- "//peridot/lib:maxwell_internal",
- "//peridot/lib/module_manifest_source:package_util",
"//src/lib/fxl",
+ "//src/modular/lib:maxwell_internal",
+ "//src/modular/lib/module_manifest_source:package_util",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/fdio",
]
diff --git a/peridot/bin/module_resolver/module_package_indexer/main.cc b/peridot/bin/module_resolver/module_package_indexer/main.cc
index 9e691d3..5cf8e53 100644
--- a/peridot/bin/module_resolver/module_package_indexer/main.cc
+++ b/peridot/bin/module_resolver/module_package_indexer/main.cc
@@ -3,24 +3,24 @@
// found in the LICENSE file.
#include <dirent.h>
+#include <fuchsia/maxwell/internal/cpp/fidl.h>
#include <glob.h>
+#include <lib/async-loop/cpp/loop.h>
+#include <lib/fdio/directory.h>
+#include <lib/fdio/fd.h>
+#include <lib/fdio/fdio.h>
#include <sys/types.h>
#include <iostream>
#include <string>
#include <vector>
-#include <fuchsia/maxwell/internal/cpp/fidl.h>
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/fdio/directory.h>
-#include <lib/fdio/fd.h>
-#include <lib/fdio/fdio.h>
#include <src/lib/fxl/command_line.h>
#include <src/lib/fxl/log_settings_command_line.h>
#include <src/lib/fxl/strings/string_printf.h>
-#include "peridot/lib/module_manifest_source/package_util.h"
#include "src/lib/files/file.h"
+#include "src/modular/lib/module_manifest_source/package_util.h"
using ::fuchsia::maxwell::internal::ModulePackageIndexer;
using ::fuchsia::maxwell::internal::ModulePackageIndexerPtr;
diff --git a/peridot/bin/module_resolver/module_resolver_main.cc b/peridot/bin/module_resolver/module_resolver_main.cc
index 31538f5..aa1f34c 100644
--- a/peridot/bin/module_resolver/module_resolver_main.cc
+++ b/peridot/bin/module_resolver/module_resolver_main.cc
@@ -16,10 +16,10 @@
#include <src/lib/fxl/macros.h>
#include "peridot/bin/module_resolver/local_module_resolver.h"
-#include "peridot/lib/module_manifest_source/firebase_source.h"
-#include "peridot/lib/module_manifest_source/module_package_source.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/module_manifest_source/firebase_source.h"
+#include "src/modular/lib/module_manifest_source/module_package_source.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionctl/BUILD.gn b/peridot/bin/sessionctl/BUILD.gn
index abab364..020171a 100644
--- a/peridot/bin/sessionctl/BUILD.gn
+++ b/peridot/bin/sessionctl/BUILD.gn
@@ -74,10 +74,10 @@
":lib",
"//peridot/bin/sessionmgr/puppet_master:puppet_master_impl",
"//peridot/lib/rapidjson",
- "//peridot/lib/testing:test_story_command_executor",
- "//peridot/lib/testing:test_with_session_storage",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_story_command_executor",
+ "//src/modular/lib/testing:test_with_session_storage",
]
}
diff --git a/peridot/bin/sessionctl/session_ctl_app_unittest.cc b/peridot/bin/sessionctl/session_ctl_app_unittest.cc
index aac032f..b00b692 100644
--- a/peridot/bin/sessionctl/session_ctl_app_unittest.cc
+++ b/peridot/bin/sessionctl/session_ctl_app_unittest.cc
@@ -9,8 +9,8 @@
#include "gtest/gtest.h"
#include "peridot/bin/sessionctl/session_ctl_constants.h"
#include "peridot/bin/sessionmgr/puppet_master/puppet_master_impl.h"
-#include "peridot/lib/testing/test_story_command_executor.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_story_command_executor.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/BUILD.gn b/peridot/bin/sessionmgr/BUILD.gn
index 7ee3957..636f7dd 100644
--- a/peridot/bin/sessionmgr/BUILD.gn
+++ b/peridot/bin/sessionmgr/BUILD.gn
@@ -21,11 +21,11 @@
deps = [
":sessionmgr_lib",
"//peridot/bin/basemgr/cobalt",
- "//peridot/lib/modular_config",
"//sdk/fidl/fuchsia.modular.internal",
"//sdk/lib/fidl/cpp",
"//sdk/lib/sys/inspect/cpp",
"//src/modular/lib/app_driver/cpp:app_driver",
+ "//src/modular/lib/modular_config",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/trace-provider-with-fdio",
]
@@ -77,20 +77,9 @@
"//peridot/bin/sessionmgr/storage",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
"//peridot/bin/sessionmgr/story_runner",
- "//peridot/lib/common:async_holder",
- "//peridot/lib/common:teardown",
- "//peridot/lib/device_info",
- "//peridot/lib/fidl:app_client",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/fidl:environment",
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/fidl:view_host",
"//peridot/lib/ledger_client:constants",
"//peridot/lib/ledger_client:operations",
"//peridot/lib/ledger_client:types",
- "//peridot/lib/modular_config:modular_config",
- "//peridot/lib/module_manifest:module_facet_reader_impl",
"//sdk/lib/fidl/cpp",
"//sdk/lib/sys/cpp",
"//sdk/lib/sys/inspect/cpp",
@@ -99,6 +88,17 @@
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp:app_driver",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/common:async_holder",
+ "//src/modular/lib/common:teardown",
+ "//src/modular/lib/device_info",
+ "//src/modular/lib/fidl:app_client",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/fidl:environment",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/fidl:view_host",
+ "//src/modular/lib/modular_config:modular_config",
+ "//src/modular/lib/module_manifest:module_facet_reader_impl",
]
}
@@ -115,17 +115,17 @@
]
deps = [
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:single_service_app",
- "//peridot/lib/fidl:view_host",
"//peridot/lib/rapidjson",
- "//peridot/lib/testing:test_driver",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/fidl/fuchsia.ui.views",
"//sdk/lib/fidl/cpp",
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:single_service_app",
+ "//src/modular/lib/fidl:view_host",
+ "//src/modular/lib/testing:test_driver",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -156,8 +156,6 @@
"//peridot/bin/sessionmgr/entity_provider_runner",
"//peridot/bin/sessionmgr/message_queue",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/ledger_client:operations",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:types",
@@ -166,6 +164,8 @@
"//src/ledger/bin/fidl",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -178,9 +178,6 @@
deps = [
"//garnet/public/lib/fsl",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/ledger_client:operations",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:types",
@@ -192,6 +189,9 @@
"//sdk/lib/fidl/cpp",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -225,10 +225,10 @@
":rate_limited_retry",
"//garnet/public/lib/svc/cpp",
"//peridot/bin/basemgr/cobalt",
- "//peridot/lib:maxwell_internal",
"//sdk/fidl/fuchsia.bluetooth.le",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.net.oldhttp",
+ "//src/modular/lib:maxwell_internal",
"//zircon/public/fidl/fuchsia-cobalt",
]
}
@@ -302,13 +302,13 @@
"//garnet/public/lib/component/cpp",
"//garnet/public/lib/component/cpp/testing",
"//garnet/public/lib/gtest",
- "//peridot/lib/fidl:clone",
"//peridot/lib/ledger_client:constants",
"//sdk/lib/sys/cpp",
"//sdk/lib/sys/cpp/testing:unit",
"//sdk/lib/sys/inspect/cpp",
"//sdk/lib/ui/scenic/cpp",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/fidl:clone",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest",
]
diff --git a/peridot/bin/sessionmgr/agent_runner/BUILD.gn b/peridot/bin/sessionmgr/agent_runner/BUILD.gn
index 97a01f0..fe980e1 100644
--- a/peridot/bin/sessionmgr/agent_runner/BUILD.gn
+++ b/peridot/bin/sessionmgr/agent_runner/BUILD.gn
@@ -28,10 +28,6 @@
"//peridot/bin/sessionmgr:component_context",
"//peridot/bin/sessionmgr/message_queue",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/common:teardown",
- "//peridot/lib/fidl:app_client",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:types",
"//sdk/fidl/fuchsia.ledger",
@@ -42,6 +38,10 @@
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/common:teardown",
+ "//src/modular/lib/fidl:app_client",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -58,11 +58,7 @@
"//garnet/public/lib/fsl",
"//peridot/bin/sessionmgr/entity_provider_runner",
"//peridot/bin/sessionmgr/message_queue",
- "//peridot/lib/fidl:array_to_string",
"//peridot/lib/ledger_client:page_client",
- "//peridot/lib/testing:fake_agent_runner_storage",
- "//peridot/lib/testing:mock_base",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.auth",
"//sdk/fidl/fuchsia.sys",
@@ -70,6 +66,10 @@
"//sdk/lib/sys/cpp/testing:unit",
"//src/lib/fxl",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/testing:fake_agent_runner_storage",
+ "//src/modular/lib/testing:mock_base",
+ "//src/modular/lib/testing:test_with_ledger",
"//zircon/public/lib/fs",
"//zircon/public/lib/trace",
]
diff --git a/peridot/bin/sessionmgr/agent_runner/agent_context_impl.cc b/peridot/bin/sessionmgr/agent_runner/agent_context_impl.cc
index d7cf4c6..d2550ef 100644
--- a/peridot/bin/sessionmgr/agent_runner/agent_context_impl.cc
+++ b/peridot/bin/sessionmgr/agent_runner/agent_context_impl.cc
@@ -9,7 +9,7 @@
#include <memory>
#include "peridot/bin/sessionmgr/agent_runner/agent_runner.h"
-#include "peridot/lib/common/teardown.h"
+#include "src/modular/lib/common/teardown.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/agent_runner/agent_context_impl.h b/peridot/bin/sessionmgr/agent_runner/agent_context_impl.h
index 5b6f5ea..a35cdfc 100644
--- a/peridot/bin/sessionmgr/agent_runner/agent_context_impl.h
+++ b/peridot/bin/sessionmgr/agent_runner/agent_context_impl.h
@@ -17,8 +17,8 @@
#include <src/lib/fxl/macros.h>
#include "peridot/bin/sessionmgr/component_context_impl.h"
-#include "peridot/lib/fidl/app_client.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/fidl/app_client.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/agent_runner/agent_runner.cc b/peridot/bin/sessionmgr/agent_runner/agent_runner.cc
index bbf7ebd..1856716 100644
--- a/peridot/bin/sessionmgr/agent_runner/agent_runner.cc
+++ b/peridot/bin/sessionmgr/agent_runner/agent_runner.cc
@@ -17,8 +17,8 @@
#include "peridot/bin/sessionmgr/agent_runner/agent_context_impl.h"
#include "peridot/bin/sessionmgr/agent_runner/agent_runner_storage_impl.h"
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/agent_runner/agent_runner_storage_impl.cc b/peridot/bin/sessionmgr/agent_runner/agent_runner_storage_impl.cc
index 08a5ec9..b6a08cc 100644
--- a/peridot/bin/sessionmgr/agent_runner/agent_runner_storage_impl.cc
+++ b/peridot/bin/sessionmgr/agent_runner/agent_runner_storage_impl.cc
@@ -11,9 +11,9 @@
#include <utility>
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/agent_runner/agent_runner_unittest.cc b/peridot/bin/sessionmgr/agent_runner/agent_runner_unittest.cc
index 3ff4ab6..1d6319d 100644
--- a/peridot/bin/sessionmgr/agent_runner/agent_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/agent_runner/agent_runner_unittest.cc
@@ -4,8 +4,6 @@
#include "peridot/bin/sessionmgr/agent_runner/agent_runner.h"
-#include <fs/service.h>
-#include <fs/synchronous-vfs.h>
#include <fuchsia/modular/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
#include <lib/component/cpp/service_provider_impl.h>
@@ -13,22 +11,25 @@
#include <lib/svc/cpp/service_namespace.h>
#include <lib/sys/cpp/testing/fake_launcher.h>
#include <lib/zx/object.h>
-#include <src/lib/fxl/macros.h>
#include <zircon/errors.h>
#include <zircon/status.h>
#include <memory>
+#include <fs/service.h>
+#include <fs/synchronous-vfs.h>
+#include <src/lib/fxl/macros.h>
+
#include "gtest/gtest.h"
#include "peridot/bin/sessionmgr/agent_runner/map_agent_service_index.h"
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.h"
#include "peridot/bin/sessionmgr/message_queue/message_queue_manager.h"
-#include "peridot/lib/fidl/array_to_string.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/fake_agent_runner_storage.h"
-#include "peridot/lib/testing/mock_base.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/lib/files/scoped_temp_dir.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/testing/fake_agent_runner_storage.h"
+#include "src/modular/lib/testing/mock_base.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
namespace testing {
diff --git a/peridot/bin/sessionmgr/component_context_impl.cc b/peridot/bin/sessionmgr/component_context_impl.cc
index 07ee31d..1bdba61 100644
--- a/peridot/bin/sessionmgr/component_context_impl.cc
+++ b/peridot/bin/sessionmgr/component_context_impl.cc
@@ -4,12 +4,12 @@
#include "peridot/bin/sessionmgr/component_context_impl.h"
-#include <src/lib/fxl/logging.h>
-
#include <utility>
+#include <src/lib/fxl/logging.h>
+
#include "peridot/bin/sessionmgr/agent_runner/agent_runner.h"
-#include "peridot/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/array_to_string.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/dev_session_shell.cc b/peridot/bin/sessionmgr/dev_session_shell.cc
index aacefe8..19e18ae 100644
--- a/peridot/bin/sessionmgr/dev_session_shell.cc
+++ b/peridot/bin/sessionmgr/dev_session_shell.cc
@@ -20,13 +20,13 @@
#include <memory>
#include <utility>
-#include "peridot/lib/fidl/single_service_app.h"
-#include "peridot/lib/fidl/view_host.h"
#include "peridot/lib/rapidjson/rapidjson.h"
#include "src/lib/fxl/command_line.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/macros.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
+#include "src/modular/lib/fidl/view_host.h"
namespace {
diff --git a/peridot/bin/sessionmgr/entity_provider_runner/BUILD.gn b/peridot/bin/sessionmgr/entity_provider_runner/BUILD.gn
index 6553d54..7ac35eca 100644
--- a/peridot/bin/sessionmgr/entity_provider_runner/BUILD.gn
+++ b/peridot/bin/sessionmgr/entity_provider_runner/BUILD.gn
@@ -17,13 +17,13 @@
deps = [
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/util",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.sys",
"//sdk/lib/fidl/cpp",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -46,10 +46,6 @@
"//garnet/public/lib/fsl",
"//peridot/bin/sessionmgr/agent_runner",
"//peridot/bin/sessionmgr/message_queue",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/testing:fake_agent_runner_storage",
- "//peridot/lib/testing:mock_base",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.auth",
"//sdk/fidl/fuchsia.sys",
@@ -58,6 +54,10 @@
"//src/lib/fxl",
"//src/lib/fxl/test:gtest_main",
"//src/modular/lib/agent/cpp",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/testing:fake_agent_runner_storage",
+ "//src/modular/lib/testing:mock_base",
+ "//src/modular/lib/testing:test_with_ledger",
"//zircon/public/lib/trace",
]
}
diff --git a/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.cc b/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.cc
index 8eebac3..a02abf9 100644
--- a/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.cc
+++ b/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.cc
@@ -8,15 +8,16 @@
#include <lib/fsl/types/type_converters.h>
#include <lib/fsl/vmo/strings.h>
-#include <src/lib/fxl/macros.h>
-#include <src/lib/fxl/strings/join_strings.h>
#include <utility>
+#include <src/lib/fxl/macros.h>
+#include <src/lib/fxl/strings/join_strings.h>
+
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_controller.h"
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_launcher.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/util/string_escape.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner_unittest.cc b/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner_unittest.cc
index d282503..c198f9c 100644
--- a/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner_unittest.cc
@@ -22,13 +22,13 @@
#include "peridot/bin/sessionmgr/agent_runner/agent_runner.h"
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_launcher.h"
#include "peridot/bin/sessionmgr/message_queue/message_queue_manager.h"
-#include "peridot/lib/fidl/array_to_string.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/fake_agent_runner_storage.h"
-#include "peridot/lib/testing/mock_base.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/lib/files/scoped_temp_dir.h"
#include "src/modular/lib/agent/cpp/agent_impl.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/testing/fake_agent_runner_storage.h"
+#include "src/modular/lib/testing/mock_base.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
namespace testing {
diff --git a/peridot/bin/sessionmgr/focus.cc b/peridot/bin/sessionmgr/focus.cc
index fc57f8c..eb42ea2 100644
--- a/peridot/bin/sessionmgr/focus.cc
+++ b/peridot/bin/sessionmgr/focus.cc
@@ -5,14 +5,15 @@
#include "peridot/bin/sessionmgr/focus.h"
#include <lib/fsl/vmo/strings.h>
+
#include <src/lib/fxl/time/time_point.h>
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/clone.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/ledger_client/operations.h"
#include "peridot/lib/rapidjson/rapidjson.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/message_queue/BUILD.gn b/peridot/bin/sessionmgr/message_queue/BUILD.gn
index e404eef..d88389a 100644
--- a/peridot/bin/sessionmgr/message_queue/BUILD.gn
+++ b/peridot/bin/sessionmgr/message_queue/BUILD.gn
@@ -15,8 +15,6 @@
"//peridot/bin/sessionmgr/agent_runner:public",
"//peridot/bin/sessionmgr/entity_provider_runner",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/ledger_client:operations",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:types",
@@ -25,5 +23,7 @@
"//src/ledger/bin/fidl",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:json_xdr",
]
}
diff --git a/peridot/bin/sessionmgr/message_queue/message_queue_manager.cc b/peridot/bin/sessionmgr/message_queue/message_queue_manager.cc
index fecb13b..59e2d3b 100644
--- a/peridot/bin/sessionmgr/message_queue/message_queue_manager.cc
+++ b/peridot/bin/sessionmgr/message_queue/message_queue_manager.cc
@@ -14,11 +14,11 @@
#include "peridot/bin/sessionmgr/message_queue/persistent_queue.h"
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/ledger_client/operations.h"
#include "peridot/lib/ledger_client/page_client.h"
#include "src/lib/fxl/strings/string_printf.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/puppet_master/BUILD.gn b/peridot/bin/sessionmgr/puppet_master/BUILD.gn
index f5c9d97..de2003e 100644
--- a/peridot/bin/sessionmgr/puppet_master/BUILD.gn
+++ b/peridot/bin/sessionmgr/puppet_master/BUILD.gn
@@ -68,10 +68,10 @@
":story_command_executor",
"//garnet/public/lib/fsl",
"//peridot/bin/sessionmgr/testing:annotations_matchers",
- "//peridot/lib/testing:test_story_command_executor",
- "//peridot/lib/testing:test_with_session_storage",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_story_command_executor",
+ "//src/modular/lib/testing:test_with_session_storage",
"//third_party/googletest:gmock",
]
}
@@ -126,9 +126,9 @@
deps = [
":dispatch_story_command_executor",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_ledger",
]
}
@@ -147,6 +147,6 @@
"//peridot/bin/sessionmgr/puppet_master/command_runners:set_focus_state_command_runner",
"//peridot/bin/sessionmgr/puppet_master/command_runners:set_kind_of_proto_story_option_command_runner",
"//peridot/bin/sessionmgr/puppet_master/command_runners:set_link_value_command_runner",
- "//peridot/lib/module_manifest:module_facet_reader",
+ "//src/modular/lib/module_manifest:module_facet_reader",
]
}
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/BUILD.gn b/peridot/bin/sessionmgr/puppet_master/command_runners/BUILD.gn
index 3d87630..cec0850 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/BUILD.gn
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/BUILD.gn
@@ -64,8 +64,8 @@
":set_link_value_command_runner",
"//garnet/public/lib/fsl",
"//garnet/public/lib/gtest",
- "//peridot/lib/testing:test_with_session_storage",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_session_storage",
]
}
@@ -77,8 +77,8 @@
deps = [
"//peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls:add_mod_call",
- "//peridot/lib/module_manifest:module_facet_reader",
"//src/lib/fxl",
+ "//src/modular/lib/module_manifest:module_facet_reader",
]
public_deps = [
@@ -98,13 +98,13 @@
":add_mod_command_runner",
"//garnet/public/lib/fsl",
"//garnet/public/lib/gtest",
- "//peridot/lib/testing:entity_resolver_fake",
- "//peridot/lib/testing:module_facet_reader_fake",
- "//peridot/lib/testing:module_resolver_fake",
- "//peridot/lib/testing:test_with_session_storage",
"//sdk/lib/fidl/cpp",
"//src/lib/fxl",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:entity_resolver_fake",
+ "//src/modular/lib/testing:module_facet_reader_fake",
+ "//src/modular/lib/testing:module_resolver_fake",
+ "//src/modular/lib/testing:test_with_session_storage",
]
}
@@ -134,8 +134,8 @@
deps = [
":remove_mod_command_runner",
"//garnet/public/lib/gtest",
- "//peridot/lib/testing:test_with_session_storage",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_session_storage",
]
}
@@ -220,7 +220,7 @@
deps = [
":set_kind_of_proto_story_option_command_runner",
"//garnet/public/lib/gtest",
- "//peridot/lib/testing:test_with_session_storage",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_session_storage",
]
}
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/add_mod_command_runner_unittest.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/add_mod_command_runner_unittest.cc
index 9651b6e..faeecfc 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/add_mod_command_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/add_mod_command_runner_unittest.cc
@@ -11,9 +11,9 @@
#include "gtest/gtest.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/entity_resolver_fake.h"
-#include "peridot/lib/testing/module_resolver_fake.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/entity_resolver_fake.h"
+#include "src/modular/lib/testing/module_resolver_fake.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
index 1e94d57..2ab870e 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
@@ -24,17 +24,17 @@
":get_types_from_entity_call",
":initialize_chain_call",
"//garnet/public/lib/fsl",
- "//peridot/lib/module_manifest:module_facet_reader",
"//sdk/lib/fidl/cpp",
"//src/lib/fxl",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/module_manifest:module_facet_reader",
]
public_deps = [
"//peridot/bin/sessionmgr/storage:story_storage",
- "//peridot/lib/fidl:clone",
"//sdk/fidl/fuchsia.modular",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:clone",
]
}
@@ -49,12 +49,12 @@
":get_types_from_entity_call",
"//garnet/public/lib/fsl",
"//peridot/bin/sessionmgr/storage:story_storage",
- "//peridot/lib/fidl:clone",
- "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/fidl:clone",
+ "//peridot/public/lib/fostr/fidl/fuchsia.modular",
]
}
@@ -66,9 +66,9 @@
deps = [
"//peridot/bin/sessionmgr/storage:story_storage",
- "//peridot/lib/fidl:clone",
"//sdk/fidl/fuchsia.modular",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:clone",
]
}
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/add_mod_call.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/add_mod_call.cc
index 9c1db79..91f876d 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/add_mod_call.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/add_mod_call.cc
@@ -13,8 +13,8 @@
#include "peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.h"
#include "peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_types_from_entity_call.h"
#include "peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/initialize_chain_call.h"
-#include "peridot/lib/fidl/clone.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/find_modules_call.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/find_modules_call.cc
index 59305cc..877d373 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/find_modules_call.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/find_modules_call.cc
@@ -10,8 +10,8 @@
#include <src/lib/fxl/logging.h>
#include "peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_types_from_entity_call.h"
-#include "peridot/lib/fidl/clone.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.cc
index 2bd7de0..5612a45 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "peridot/bin/sessionmgr/puppet_master/command_runners/operation_calls/get_link_path_for_parameter_name_call.h"
-#include "peridot/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/remove_mod_command_runner_unittest.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/remove_mod_command_runner_unittest.cc
index e0e21a5..c87c651 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/remove_mod_command_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/remove_mod_command_runner_unittest.cc
@@ -5,7 +5,7 @@
#include "peridot/bin/sessionmgr/puppet_master/command_runners/remove_mod_command_runner.h"
#include "gtest/gtest.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/set_kind_of_proto_story_option_command_runner_unittest.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/set_kind_of_proto_story_option_command_runner_unittest.cc
index 31190e4..68f4fa7 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/set_kind_of_proto_story_option_command_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/set_kind_of_proto_story_option_command_runner_unittest.cc
@@ -7,7 +7,7 @@
#include <lib/fsl/vmo/strings.h>
#include "gtest/gtest.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/puppet_master/command_runners/set_link_value_command_runner_unittest.cc b/peridot/bin/sessionmgr/puppet_master/command_runners/set_link_value_command_runner_unittest.cc
index d8e56d7..ba72b76 100644
--- a/peridot/bin/sessionmgr/puppet_master/command_runners/set_link_value_command_runner_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/command_runners/set_link_value_command_runner_unittest.cc
@@ -7,7 +7,7 @@
#include <lib/fsl/vmo/strings.h>
#include "gtest/gtest.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/puppet_master/dispatch_story_command_executor_unittest.cc b/peridot/bin/sessionmgr/puppet_master/dispatch_story_command_executor_unittest.cc
index 879e8c8..433f674 100644
--- a/peridot/bin/sessionmgr/puppet_master/dispatch_story_command_executor_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/dispatch_story_command_executor_unittest.cc
@@ -13,8 +13,8 @@
#include <memory>
#include "gtest/gtest.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/puppet_master/puppet_master_impl_unittest.cc b/peridot/bin/sessionmgr/puppet_master/puppet_master_impl_unittest.cc
index 0f14a55..5928d7e 100644
--- a/peridot/bin/sessionmgr/puppet_master/puppet_master_impl_unittest.cc
+++ b/peridot/bin/sessionmgr/puppet_master/puppet_master_impl_unittest.cc
@@ -11,8 +11,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "peridot/bin/sessionmgr/testing/annotations_matchers.h"
-#include "peridot/lib/testing/test_story_command_executor.h"
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_story_command_executor.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace {
diff --git a/peridot/bin/sessionmgr/sessionmgr.cc b/peridot/bin/sessionmgr/sessionmgr.cc
index 468950a..a28823f 100644
--- a/peridot/bin/sessionmgr/sessionmgr.cc
+++ b/peridot/bin/sessionmgr/sessionmgr.cc
@@ -18,9 +18,9 @@
#include "peridot/bin/basemgr/cobalt/cobalt.h"
#include "peridot/bin/sessionmgr/sessionmgr_impl.h"
-#include "peridot/lib/modular_config/modular_config.h"
-#include "peridot/lib/modular_config/modular_config_constants.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/modular_config/modular_config.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
fit::deferred_action<fit::closure> SetupCobalt(const bool enable_cobalt,
async_dispatcher_t* dispatcher,
diff --git a/peridot/bin/sessionmgr/sessionmgr_impl.cc b/peridot/bin/sessionmgr/sessionmgr_impl.cc
index 41f5c8c..a3548936 100644
--- a/peridot/bin/sessionmgr/sessionmgr_impl.cc
+++ b/peridot/bin/sessionmgr/sessionmgr_impl.cc
@@ -35,19 +35,19 @@
#include "peridot/bin/sessionmgr/storage/session_storage.h"
#include "peridot/bin/sessionmgr/story_runner/link_impl.h"
#include "peridot/bin/sessionmgr/story_runner/story_provider_impl.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/device_info/device_info.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/environment.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/ledger_client/constants.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/module_manifest/module_facet_reader_impl.h"
#include "src/lib/files/directory.h"
#include "src/lib/files/unique_fd.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/macros.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/device_info/device_info.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/environment.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/module_manifest/module_facet_reader_impl.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/sessionmgr_impl.h b/peridot/bin/sessionmgr/sessionmgr_impl.h
index 552e8174..c384e80 100644
--- a/peridot/bin/sessionmgr/sessionmgr_impl.h
+++ b/peridot/bin/sessionmgr/sessionmgr_impl.h
@@ -32,15 +32,15 @@
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_launcher.h"
#include "peridot/bin/sessionmgr/entity_provider_runner/entity_provider_runner.h"
#include "peridot/bin/sessionmgr/user_intelligence_provider_impl.h"
-#include "peridot/lib/common/async_holder.h"
-#include "peridot/lib/fidl/app_client.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/environment.h"
-#include "peridot/lib/fidl/view_host.h"
-#include "peridot/lib/module_manifest/module_facet_reader.h"
#include "peridot/lib/rapidjson/rapidjson.h"
#include "peridot/lib/scoped_tmpfs/scoped_tmpfs.h"
#include "src/lib/fxl/macros.h"
+#include "src/modular/lib/common/async_holder.h"
+#include "src/modular/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/environment.h"
+#include "src/modular/lib/fidl/view_host.h"
+#include "src/modular/lib/module_manifest/module_facet_reader.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/sessionmgr_impl_unittest.cc b/peridot/bin/sessionmgr/sessionmgr_impl_unittest.cc
index 8b15402..65d1131 100644
--- a/peridot/bin/sessionmgr/sessionmgr_impl_unittest.cc
+++ b/peridot/bin/sessionmgr/sessionmgr_impl_unittest.cc
@@ -20,9 +20,9 @@
#include "lib/fit/function.h"
#include "lib/ui/scenic/cpp/view_token_pair.h"
#include "lib/vfs/cpp/pseudo_dir.h"
-#include "peridot/lib/fidl/clone.h"
#include "peridot/lib/ledger_client/constants.h"
#include "src/lib/fxl/logging.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
namespace testing {
diff --git a/peridot/bin/sessionmgr/storage/BUILD.gn b/peridot/bin/sessionmgr/storage/BUILD.gn
index 3f232f9..ee0b766 100644
--- a/peridot/bin/sessionmgr/storage/BUILD.gn
+++ b/peridot/bin/sessionmgr/storage/BUILD.gn
@@ -64,9 +64,9 @@
deps = [
":session_storage_xdr",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/fidl:clone",
"//peridot/lib/ledger_client:operations",
"//src/lib/uuid",
+ "//src/modular/lib/fidl:clone",
]
public_deps = [
@@ -87,9 +87,9 @@
deps = [
"//garnet/public/lib/fsl",
"//peridot/lib/base64url",
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.internal",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -103,11 +103,11 @@
deps = [
":session_storage",
"//peridot/bin/sessionmgr/testing:annotations_matchers",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.ledger",
"//src/lib/fxl/test:gtest_main",
"//src/modular/lib/async/cpp:future",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/testing:test_with_ledger",
"//third_party/googletest:gmock",
"//zircon/system/public",
]
@@ -122,11 +122,11 @@
deps = [
":story_storage_xdr",
"//peridot/bin/sessionmgr/storage:constants_and_utils",
- "//peridot/lib/fidl:clone",
"//peridot/lib/ledger_client:operations",
"//sdk/fidl/fuchsia.ledger",
"//sdk/fidl/fuchsia.modular",
"//src/modular/lib/async/cpp:future",
+ "//src/modular/lib/fidl:clone",
]
public_deps = [
"//peridot/lib/ledger_client:page_client",
@@ -143,10 +143,10 @@
deps = [
"//garnet/public/lib/fsl",
"//peridot/lib/base64url",
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/module_manifest:json_xdr",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.internal",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/module_manifest:json_xdr",
]
}
@@ -159,10 +159,10 @@
deps = [
":story_storage",
- "//peridot/lib/entity:entity_watcher",
- "//peridot/lib/testing:test_with_ledger",
"//sdk/fidl/fuchsia.ledger",
"//src/lib/fxl/test:gtest_main",
"//src/modular/lib/async/cpp:future",
+ "//src/modular/lib/entity:entity_watcher",
+ "//src/modular/lib/testing:test_with_ledger",
]
}
diff --git a/peridot/bin/sessionmgr/storage/session_storage.cc b/peridot/bin/sessionmgr/storage/session_storage.cc
index 21712f2..3cb9212 100644
--- a/peridot/bin/sessionmgr/storage/session_storage.cc
+++ b/peridot/bin/sessionmgr/storage/session_storage.cc
@@ -12,9 +12,9 @@
#include "fuchsia/ledger/cpp/fidl.h"
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
#include "peridot/bin/sessionmgr/storage/session_storage_xdr.h"
-#include "peridot/lib/fidl/clone.h"
#include "peridot/lib/ledger_client/operations.h"
#include "src/lib/uuid/uuid.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/storage/session_storage_unittest.cc b/peridot/bin/sessionmgr/storage/session_storage_unittest.cc
index 20bf943..f228057 100644
--- a/peridot/bin/sessionmgr/storage/session_storage_unittest.cc
+++ b/peridot/bin/sessionmgr/storage/session_storage_unittest.cc
@@ -12,10 +12,10 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "peridot/bin/sessionmgr/testing/annotations_matchers.h"
-#include "peridot/lib/fidl/array_to_string.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
#include "zircon/system/public/zircon/errors.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/storage/session_storage_xdr.h b/peridot/bin/sessionmgr/storage/session_storage_xdr.h
index 97c0b45..b400a15 100644
--- a/peridot/bin/sessionmgr/storage/session_storage_xdr.h
+++ b/peridot/bin/sessionmgr/storage/session_storage_xdr.h
@@ -7,7 +7,7 @@
#include <fuchsia/modular/internal/cpp/fidl.h>
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/storage/story_storage.cc b/peridot/bin/sessionmgr/storage/story_storage.cc
index aa6b9c5..3b265a3 100644
--- a/peridot/bin/sessionmgr/storage/story_storage.cc
+++ b/peridot/bin/sessionmgr/storage/story_storage.cc
@@ -8,14 +8,15 @@
#include <lib/fidl/cpp/clone.h>
#include <lib/fit/result.h>
#include <lib/fsl/vmo/strings.h>
-#include <src/lib/fxl/strings/string_view.h>
#include <zircon/status.h>
+#include <src/lib/fxl/strings/string_view.h>
+
#include "fuchsia/ledger/cpp/fidl.h"
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
#include "peridot/bin/sessionmgr/storage/story_storage_xdr.h"
-#include "peridot/lib/fidl/clone.h"
#include "peridot/lib/ledger_client/operations.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/storage/story_storage_unittest.cc b/peridot/bin/sessionmgr/storage/story_storage_unittest.cc
index 2f06c8a..e7ea2a3 100644
--- a/peridot/bin/sessionmgr/storage/story_storage_unittest.cc
+++ b/peridot/bin/sessionmgr/storage/story_storage_unittest.cc
@@ -9,10 +9,10 @@
#include <memory>
#include "gtest/gtest.h"
-#include "peridot/lib/entity/entity_watcher_impl.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/entity/entity_watcher_impl.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
using fuchsia::modular::ModuleData;
using fuchsia::modular::ModuleDataPtr;
diff --git a/peridot/bin/sessionmgr/storage/story_storage_xdr.cc b/peridot/bin/sessionmgr/storage/story_storage_xdr.cc
index 8712942..890e906 100644
--- a/peridot/bin/sessionmgr/storage/story_storage_xdr.cc
+++ b/peridot/bin/sessionmgr/storage/story_storage_xdr.cc
@@ -7,7 +7,7 @@
#include <lib/fidl/cpp/clone.h>
#include <lib/fsl/vmo/strings.h>
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/storage/story_storage_xdr.h b/peridot/bin/sessionmgr/storage/story_storage_xdr.h
index 27fc99a..72ad4c3 100644
--- a/peridot/bin/sessionmgr/storage/story_storage_xdr.h
+++ b/peridot/bin/sessionmgr/storage/story_storage_xdr.h
@@ -7,7 +7,7 @@
#include <fuchsia/modular/internal/cpp/fidl.h>
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/story/model/BUILD.gn b/peridot/bin/sessionmgr/story/model/BUILD.gn
index 7dbf75c..77a210e 100644
--- a/peridot/bin/sessionmgr/story/model/BUILD.gn
+++ b/peridot/bin/sessionmgr/story/model/BUILD.gn
@@ -65,8 +65,8 @@
]
public_deps = [
- "//peridot/public/lib/fostr/fidl/fuchsia.modular.storymodel",
"//sdk/fidl/fuchsia.modular.storymodel",
+ "//peridot/public/lib/fostr/fidl/fuchsia.modular.storymodel",
]
deps = [
@@ -118,11 +118,11 @@
":apply_mutations",
":story_model_storage",
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:array_to_string",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:promise",
"//sdk/fidl/fuchsia.ledger",
"//src/lib/fxl",
+ "//src/modular/lib/fidl:array_to_string",
]
}
@@ -139,8 +139,8 @@
"testing",
"//garnet/public/lib/async_promise",
"//peridot/lib/ledger_client:page_client",
- "//peridot/lib/testing:test_with_ledger",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/testing:test_with_ledger",
"//third_party/googletest:gtest",
]
}
diff --git a/peridot/bin/sessionmgr/story/model/ledger_story_model_storage_unittest.cc b/peridot/bin/sessionmgr/story/model/ledger_story_model_storage_unittest.cc
index b740a79..8513427 100644
--- a/peridot/bin/sessionmgr/story/model/ledger_story_model_storage_unittest.cc
+++ b/peridot/bin/sessionmgr/story/model/ledger_story_model_storage_unittest.cc
@@ -15,7 +15,7 @@
#include "peridot/bin/sessionmgr/story/model/testing/mutation_matchers.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/test_with_ledger.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
using fuchsia::modular::StoryState;
using fuchsia::modular::StoryVisibilityState;
diff --git a/peridot/bin/sessionmgr/story/model/story_model_owner.cc b/peridot/bin/sessionmgr/story/model/story_model_owner.cc
index d983faf..ab6fdab 100644
--- a/peridot/bin/sessionmgr/story/model/story_model_owner.cc
+++ b/peridot/bin/sessionmgr/story/model/story_model_owner.cc
@@ -6,6 +6,7 @@
#include <lib/fit/bridge.h>
#include <lib/fit/defer.h>
+
#include <src/lib/fxl/logging.h>
#include "peridot/bin/sessionmgr/story/model/apply_mutations.h"
@@ -21,7 +22,7 @@
namespace {
// Sets default values for all fields of a new StoryModel. Defaults are
// documented in
-// peridot/lib/fidl/public/fuchsia.modular.storymodel/story_model.fidl.
+// src/modular/lib/fidl/public/fuchsia.modular.storymodel/story_model.fidl.
void InitializeModelDefaults(StoryModel* model) {
model->set_runtime_state(fuchsia::modular::StoryState::STOPPED);
model->set_visibility_state(fuchsia::modular::StoryVisibilityState::DEFAULT);
diff --git a/peridot/bin/sessionmgr/story/model/testing/BUILD.gn b/peridot/bin/sessionmgr/story/model/testing/BUILD.gn
index 4b84ad0..cb44e05 100644
--- a/peridot/bin/sessionmgr/story/model/testing/BUILD.gn
+++ b/peridot/bin/sessionmgr/story/model/testing/BUILD.gn
@@ -19,9 +19,9 @@
]
public_deps = [
+ "//sdk/fidl/fuchsia.modular.storymodel",
"//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//peridot/public/lib/fostr/fidl/fuchsia.modular.storymodel",
- "//sdk/fidl/fuchsia.modular.storymodel",
"//third_party/googletest:gmock",
]
}
diff --git a/peridot/bin/sessionmgr/story_runner/BUILD.gn b/peridot/bin/sessionmgr/story_runner/BUILD.gn
index cbab0b6..371dc08 100644
--- a/peridot/bin/sessionmgr/story_runner/BUILD.gn
+++ b/peridot/bin/sessionmgr/story_runner/BUILD.gn
@@ -50,20 +50,11 @@
"//peridot/bin/sessionmgr/storage:constants_and_utils",
"//peridot/bin/sessionmgr/story/model",
"//peridot/bin/sessionmgr/story/systems:story_visibility_system",
- "//peridot/lib/common:async_holder",
- "//peridot/lib/common:teardown",
- "//peridot/lib/fidl:app_client",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:environment",
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/fidl:proxy",
"//peridot/lib/ledger_client:operations",
"//peridot/lib/ledger_client:page_client",
"//peridot/lib/ledger_client:types",
- "//peridot/lib/module_manifest:module_facet_reader",
"//peridot/lib/rapidjson",
"//peridot/lib/util",
- "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.app.discover",
"//sdk/fidl/fuchsia.ledger",
"//sdk/fidl/fuchsia.modular",
@@ -78,8 +69,17 @@
"//src/lib/fxl",
"//src/modular/lib/async/cpp:future",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/common:async_holder",
+ "//src/modular/lib/common:teardown",
"//src/modular/lib/context/cpp:context_helper",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/fidl:app_client",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:environment",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/fidl:proxy",
+ "//peridot/public/lib/fostr/fidl/fuchsia.modular",
+ "//src/modular/lib/module_manifest:module_facet_reader",
]
deps = [
@@ -88,11 +88,11 @@
"//peridot/bin/sessionmgr/story/model",
"//peridot/bin/sessionmgr/story/model:noop_story_model_storage",
"//peridot/bin/sessionmgr/story/model:story_model_owner",
- "//peridot/lib/fidl:clone",
"//sdk/fidl/fuchsia.ui.app",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/lib/ui/scenic/cpp",
"//src/lib/uuid",
+ "//src/modular/lib/fidl:clone",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -109,14 +109,14 @@
]
deps = [
- "//peridot/lib/fidl:single_service_app",
- "//peridot/lib/fidl:view_host",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/fidl/fuchsia.ui.views",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
+ "//src/modular/lib/fidl:view_host",
"//zircon/public/lib/async-loop-cpp",
]
}
@@ -130,8 +130,8 @@
deps = [
":story_runner",
- "//peridot/lib/fidl:clone",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/fidl:clone",
]
}
@@ -145,9 +145,9 @@
deps = [
":story_runner",
"//peridot/bin/sessionmgr/agent_runner",
- "//peridot/lib/fidl:clone",
- "//peridot/lib/testing:test_with_ledger",
"//src/lib/fxl/test:gtest_main",
"//src/modular/lib/entity/cpp:json",
+ "//src/modular/lib/fidl:clone",
+ "//src/modular/lib/testing:test_with_ledger",
]
}
diff --git a/peridot/bin/sessionmgr/story_runner/dev_story_shell.cc b/peridot/bin/sessionmgr/story_runner/dev_story_shell.cc
index b7423af..5fbca2b 100644
--- a/peridot/bin/sessionmgr/story_runner/dev_story_shell.cc
+++ b/peridot/bin/sessionmgr/story_runner/dev_story_shell.cc
@@ -14,12 +14,12 @@
#include <memory>
-#include "peridot/lib/fidl/single_service_app.h"
-#include "peridot/lib/fidl/view_host.h"
#include "src/lib/fxl/command_line.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/macros.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
+#include "src/modular/lib/fidl/view_host.h"
namespace {
diff --git a/peridot/bin/sessionmgr/story_runner/link_impl_unittest.cc b/peridot/bin/sessionmgr/story_runner/link_impl_unittest.cc
index c37d156..8f30223 100644
--- a/peridot/bin/sessionmgr/story_runner/link_impl_unittest.cc
+++ b/peridot/bin/sessionmgr/story_runner/link_impl_unittest.cc
@@ -9,16 +9,16 @@
#include "gtest/gtest.h"
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/clone.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_client.h"
#include "peridot/lib/ledger_client/page_id.h"
#include "peridot/lib/rapidjson/rapidjson.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/modular/lib/async/cpp/operation.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
using fuchsia::modular::CreateLinkInfo;
using fuchsia::modular::CreateLinkInfoPtr;
diff --git a/peridot/bin/sessionmgr/story_runner/module_context_impl.cc b/peridot/bin/sessionmgr/story_runner/module_context_impl.cc
index 95686ce..61ef17d 100644
--- a/peridot/bin/sessionmgr/story_runner/module_context_impl.cc
+++ b/peridot/bin/sessionmgr/story_runner/module_context_impl.cc
@@ -11,8 +11,8 @@
#include "peridot/bin/sessionmgr/storage/constants_and_utils.h"
#include "peridot/bin/sessionmgr/story/systems/story_visibility_system.h"
#include "peridot/bin/sessionmgr/story_runner/story_controller_impl.h"
-#include "peridot/lib/fidl/clone.h"
#include "src/lib/fxl/strings/join_strings.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/story_runner/module_controller_impl.cc b/peridot/bin/sessionmgr/story_runner/module_controller_impl.cc
index d3c5bdb..6cb8eb6 100644
--- a/peridot/bin/sessionmgr/story_runner/module_controller_impl.cc
+++ b/peridot/bin/sessionmgr/story_runner/module_controller_impl.cc
@@ -10,12 +10,13 @@
#include <lib/fidl/cpp/interface_handle.h>
#include <lib/fidl/cpp/interface_ptr.h>
#include <lib/fidl/cpp/interface_request.h>
+
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/time/time_delta.h>
#include "peridot/bin/sessionmgr/story_runner/story_controller_impl.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/clone.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/story_runner/module_controller_impl.h b/peridot/bin/sessionmgr/story_runner/module_controller_impl.h
index 8a12cb2..5187e18 100644
--- a/peridot/bin/sessionmgr/story_runner/module_controller_impl.h
+++ b/peridot/bin/sessionmgr/story_runner/module_controller_impl.h
@@ -13,11 +13,12 @@
#include <lib/fidl/cpp/interface_ptr.h>
#include <lib/fidl/cpp/interface_ptr_set.h>
#include <lib/fidl/cpp/interface_request.h>
-#include <src/lib/fxl/macros.h>
#include <vector>
-#include "peridot/lib/fidl/app_client.h"
+#include <src/lib/fxl/macros.h>
+
+#include "src/modular/lib/fidl/app_client.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/story_runner/story_controller_impl.cc b/peridot/bin/sessionmgr/story_runner/story_controller_impl.cc
index 8e8d580..b321397 100644
--- a/peridot/bin/sessionmgr/story_runner/story_controller_impl.cc
+++ b/peridot/bin/sessionmgr/story_runner/story_controller_impl.cc
@@ -45,13 +45,13 @@
#include "peridot/bin/sessionmgr/story_runner/ongoing_activity_impl.h"
#include "peridot/bin/sessionmgr/story_runner/story_provider_impl.h"
#include "peridot/bin/sessionmgr/story_runner/story_shell_context_impl.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/clone.h"
#include "peridot/lib/ledger_client/operations.h"
#include "peridot/lib/util/string_escape.h"
#include "src/modular/lib/async/cpp/future.h"
+#include "src/modular/lib/common/teardown.h"
#include "src/modular/lib/entity/cpp/json.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/clone.h"
// Used to create std::set<LinkPath>.
namespace std {
diff --git a/peridot/bin/sessionmgr/story_runner/story_controller_impl.h b/peridot/bin/sessionmgr/story_runner/story_controller_impl.h
index 923947f..6a198db 100644
--- a/peridot/bin/sessionmgr/story_runner/story_controller_impl.h
+++ b/peridot/bin/sessionmgr/story_runner/story_controller_impl.h
@@ -37,12 +37,12 @@
#include "peridot/bin/sessionmgr/story_runner/link_impl.h"
#include "peridot/bin/sessionmgr/story_runner/ongoing_activity_impl.h"
#include "peridot/bin/sessionmgr/story_runner/story_shell_context_impl.h"
-#include "peridot/lib/fidl/app_client.h"
-#include "peridot/lib/fidl/environment.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_client.h"
#include "peridot/lib/ledger_client/types.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/environment.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/story_runner/story_provider_impl.cc b/peridot/bin/sessionmgr/story_runner/story_provider_impl.cc
index 1b1d8ec..0328226 100644
--- a/peridot/bin/sessionmgr/story_runner/story_provider_impl.cc
+++ b/peridot/bin/sessionmgr/story_runner/story_provider_impl.cc
@@ -28,12 +28,12 @@
#include "peridot/bin/sessionmgr/story/systems/story_visibility_system.h"
#include "peridot/bin/sessionmgr/story_runner/link_impl.h"
#include "peridot/bin/sessionmgr/story_runner/story_controller_impl.h"
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/clone.h"
-#include "peridot/lib/fidl/proxy.h"
#include "peridot/lib/rapidjson/rapidjson.h"
#include "src/lib/uuid/uuid.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/clone.h"
+#include "src/modular/lib/fidl/proxy.h"
// In tests prefetching mondrian saved ~30ms in story start up time.
#define PREFETCH_MONDRIAN 1
diff --git a/peridot/bin/sessionmgr/story_runner/story_provider_impl.h b/peridot/bin/sessionmgr/story_runner/story_provider_impl.h
index 4ae793c..272e2bb 100644
--- a/peridot/bin/sessionmgr/story_runner/story_provider_impl.h
+++ b/peridot/bin/sessionmgr/story_runner/story_provider_impl.h
@@ -34,14 +34,14 @@
#include "peridot/bin/sessionmgr/story/model/story_model_owner.h"
#include "peridot/bin/sessionmgr/story/system.h"
#include "peridot/bin/sessionmgr/story_runner/story_entity_provider.h"
-#include "peridot/lib/fidl/app_client.h"
-#include "peridot/lib/fidl/environment.h"
-#include "peridot/lib/fidl/proxy.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_client.h"
#include "peridot/lib/ledger_client/types.h"
-#include "peridot/lib/module_manifest/module_facet_reader.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/environment.h"
+#include "src/modular/lib/fidl/proxy.h"
+#include "src/modular/lib/module_manifest/module_facet_reader.h"
namespace modular {
diff --git a/peridot/bin/sessionmgr/testing/BUILD.gn b/peridot/bin/sessionmgr/testing/BUILD.gn
index 6361c24..8a70fd2 100644
--- a/peridot/bin/sessionmgr/testing/BUILD.gn
+++ b/peridot/bin/sessionmgr/testing/BUILD.gn
@@ -19,8 +19,8 @@
public_deps = [
"//garnet/public/lib/fsl",
- "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular",
+ "//peridot/public/lib/fostr/fidl/fuchsia.modular",
"//third_party/googletest:gmock",
]
}
diff --git a/peridot/examples/swap_cpp/BUILD.gn b/peridot/examples/swap_cpp/BUILD.gn
index d10af9c..53f2d272 100644
--- a/peridot/examples/swap_cpp/BUILD.gn
+++ b/peridot/examples/swap_cpp/BUILD.gn
@@ -60,7 +60,7 @@
public_deps = [
"//garnet/public/lib/ui/base_view/cpp",
- "//peridot/lib/fidl:single_service_app",
+ "//src/modular/lib/fidl:single_service_app",
"//zircon/public/lib/zx",
]
@@ -85,12 +85,12 @@
]
deps = [
"//garnet/public/lib/ui/base_view/cpp",
- "//peridot/lib/fidl:single_service_app",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.ui.gfx",
"//sdk/fidl/fuchsia.ui.views",
"//sdk/lib/ui/scenic/cpp",
"//src/modular/lib/app_driver/cpp",
+ "//src/modular/lib/fidl:single_service_app",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/trace-provider-with-fdio",
]
diff --git a/peridot/examples/swap_cpp/module.h b/peridot/examples/swap_cpp/module.h
index d80e02a..f21e2e2 100644
--- a/peridot/examples/swap_cpp/module.h
+++ b/peridot/examples/swap_cpp/module.h
@@ -10,8 +10,8 @@
#include <lib/ui/base_view/cpp/base_view.h>
#include <lib/zx/eventpair.h>
-#include "peridot/lib/fidl/single_service_app.h"
#include "src/lib/fxl/logging.h"
+#include "src/modular/lib/fidl/single_service_app.h"
namespace modular_example {
diff --git a/peridot/examples/swap_cpp/swap_recipe.cc b/peridot/examples/swap_cpp/swap_recipe.cc
index 871a622..2db2dfe 100644
--- a/peridot/examples/swap_cpp/swap_recipe.cc
+++ b/peridot/examples/swap_cpp/swap_recipe.cc
@@ -17,9 +17,9 @@
#include <array>
#include <memory>
-#include "peridot/lib/fidl/single_service_app.h"
#include "src/lib/fxl/logging.h"
#include "src/modular/lib/app_driver/cpp/app_driver.h"
+#include "src/modular/lib/fidl/single_service_app.h"
#include "trace-provider/provider.h"
namespace {
diff --git a/peridot/lib/BUILD.gn b/peridot/lib/BUILD.gn
index 88119f7..4c13a4e1 100644
--- a/peridot/lib/BUILD.gn
+++ b/peridot/lib/BUILD.gn
@@ -2,30 +2,20 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/fidl/fidl.gni")
import("//build/package.gni")
group("lib") {
testonly = true
deps = [
- ":maxwell_internal",
":peridot_lib_unittests",
"base64url",
- "bound_set",
- "common",
"convert",
- "device_info",
- "entity",
- "fidl",
"firebase",
"ledger_client",
- "module_manifest",
- "module_manifest_source",
"rapidjson",
"rng",
"scoped_tmpfs",
"socket",
- "testing",
"util",
]
}
@@ -36,11 +26,8 @@
deps = [
"//peridot/lib/base64url:unittests",
"//peridot/lib/convert:unittests",
- "//peridot/lib/fidl:unittests",
"//peridot/lib/firebase:unittests",
"//peridot/lib/ledger_client:unittests",
- "//peridot/lib/modular_config:unittests",
- "//peridot/lib/module_manifest:unittests",
"//peridot/lib/rng:unittests",
"//peridot/lib/scoped_tmpfs:unittests",
"//peridot/lib/socket:unittests",
@@ -48,11 +35,3 @@
"//src/lib/fxl/test:gtest_main",
]
}
-
-fidl("maxwell_internal") {
- name = "fuchsia.maxwell.internal"
-
- sources = [
- "module_manifest_source/fidl/module_package_indexer.fidl",
- ]
-}
diff --git a/peridot/lib/entity/BUILD.gn b/peridot/lib/entity/BUILD.gn
deleted file mode 100644
index a2d572e..0000000
--- a/peridot/lib/entity/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2018 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-group("entity") {
- testonly = true
- deps = [
- ":entity_watcher",
- ]
-}
-
-source_set("entity_watcher") {
- sources = [
- "entity_watcher_impl.cc",
- "entity_watcher_impl.h",
- ]
-
- public_deps = [
- "//src/lib/fxl",
- ]
-
- deps = [
- "//sdk/fidl/fuchsia.modular",
- ]
-}
diff --git a/peridot/lib/firebase/BUILD.gn b/peridot/lib/firebase/BUILD.gn
index 17d2180..ae014121 100644
--- a/peridot/lib/firebase/BUILD.gn
+++ b/peridot/lib/firebase/BUILD.gn
@@ -5,6 +5,7 @@
visibility = [
"//peridot/bin/*",
"//peridot/lib/*",
+ "//src/modular/*",
]
source_set("firebase") {
diff --git a/peridot/lib/ledger_client/BUILD.gn b/peridot/lib/ledger_client/BUILD.gn
index 3a69cbf..a1ed402 100644
--- a/peridot/lib/ledger_client/BUILD.gn
+++ b/peridot/lib/ledger_client/BUILD.gn
@@ -26,11 +26,11 @@
public_deps = [
":page_client",
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.ledger",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -47,11 +47,11 @@
deps = [
":types",
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/fidl:clone",
"//sdk/lib/fidl/cpp",
"//src/ledger/bin/fidl",
"//src/lib/fxl",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/fidl:clone",
]
public_deps = [
@@ -67,8 +67,8 @@
]
public_deps = [
- "//peridot/lib/fidl:array_to_string",
"//sdk/fidl/fuchsia.ledger",
+ "//src/modular/lib/fidl:array_to_string",
]
}
@@ -100,10 +100,10 @@
deps = [
":page_client",
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:array_to_string",
- "//peridot/lib/testing:test_with_ledger",
"//src/lib/fxl",
"//src/modular/lib/async/cpp:operation",
+ "//src/modular/lib/fidl:array_to_string",
+ "//src/modular/lib/testing:test_with_ledger",
"//third_party/googletest:gtest",
]
}
diff --git a/peridot/lib/ledger_client/ledger_client.cc b/peridot/lib/ledger_client/ledger_client.cc
index 89ceae2..f48f58e 100644
--- a/peridot/lib/ledger_client/ledger_client.cc
+++ b/peridot/lib/ledger_client/ledger_client.cc
@@ -4,16 +4,16 @@
#include "peridot/lib/ledger_client/ledger_client.h"
-#include <algorithm>
-
#include <lib/fsl/vmo/strings.h>
#include <zircon/status.h>
#include <zircon/types.h>
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/clone.h"
+#include <algorithm>
+
#include "peridot/lib/ledger_client/page_client.h"
#include "peridot/lib/ledger_client/types.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/clone.h"
namespace modular {
diff --git a/peridot/lib/ledger_client/operations.h b/peridot/lib/ledger_client/operations.h
index 3fd6068..9d31a60 100644
--- a/peridot/lib/ledger_client/operations.h
+++ b/peridot/lib/ledger_client/operations.h
@@ -13,10 +13,10 @@
#include <string>
-#include "peridot/lib/fidl/array_to_string.h"
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/ledger_client/page_client.h"
#include "src/modular/lib/async/cpp/operation.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
diff --git a/peridot/lib/ledger_client/page_client.cc b/peridot/lib/ledger_client/page_client.cc
index 62d3c6bc..f46ca20 100644
--- a/peridot/lib/ledger_client/page_client.cc
+++ b/peridot/lib/ledger_client/page_client.cc
@@ -4,14 +4,14 @@
#include "peridot/lib/ledger_client/page_client.h"
-#include <memory>
-#include <utility>
-
#include <lib/fsl/vmo/strings.h>
#include <zircon/status.h>
-#include "peridot/lib/fidl/array_to_string.h"
+#include <memory>
+#include <utility>
+
#include "peridot/lib/ledger_client/ledger_client.h"
+#include "src/modular/lib/fidl/array_to_string.h"
namespace modular {
diff --git a/peridot/lib/ledger_client/page_client_unittest.cc b/peridot/lib/ledger_client/page_client_unittest.cc
index 5517bfb2..d6d9083 100644
--- a/peridot/lib/ledger_client/page_client_unittest.cc
+++ b/peridot/lib/ledger_client/page_client_unittest.cc
@@ -7,11 +7,11 @@
#include <memory>
#include "gtest/gtest.h"
-#include "peridot/lib/fidl/array_to_string.h"
#include "peridot/lib/ledger_client/ledger_client.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/test_with_ledger.h"
#include "src/lib/fxl/macros.h"
+#include "src/modular/lib/fidl/array_to_string.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
namespace testing {
diff --git a/peridot/lib/ledger_client/promise.h b/peridot/lib/ledger_client/promise.h
index 053cbc4..880f7ce 100644
--- a/peridot/lib/ledger_client/promise.h
+++ b/peridot/lib/ledger_client/promise.h
@@ -9,8 +9,8 @@
#include <lib/fit/bridge.h>
#include <lib/fit/promise.h>
-#include "peridot/lib/fidl/array_to_string.h" // for to_string(), to_array()
#include "src/lib/fxl/logging.h"
+#include "src/modular/lib/fidl/array_to_string.h" // for to_string(), to_array()
namespace modular {
diff --git a/peridot/lib/scoped_tmpfs/BUILD.gn b/peridot/lib/scoped_tmpfs/BUILD.gn
index 18fa3f4..c997942 100644
--- a/peridot/lib/scoped_tmpfs/BUILD.gn
+++ b/peridot/lib/scoped_tmpfs/BUILD.gn
@@ -6,6 +6,7 @@
"//peridot/bin/*",
"//peridot/lib/*",
"//src/ledger/*",
+ "//src/modular/*",
]
source_set("scoped_tmpfs") {
diff --git a/src/modular/benchmarks/BUILD.gn b/src/modular/benchmarks/BUILD.gn
index fce83b0..4310133 100644
--- a/src/modular/benchmarks/BUILD.gn
+++ b/src/modular/benchmarks/BUILD.gn
@@ -31,13 +31,13 @@
":tracing_waiter",
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
- "//peridot/lib/testing:session_shell_impl",
"//sdk/fidl/fuchsia.modular.testing",
"//sdk/fidl/fuchsia.sys",
"//sdk/lib/sys/cpp",
"//sdk/lib/sys/cpp/testing:integration",
"//src/lib/fxl",
"//src/modular/lib/modular_test_harness/cpp:test_harness_fixture",
+ "//src/modular/lib/testing:session_shell_impl",
"//third_party/googletest:gtest_main",
]
}
diff --git a/src/modular/benchmarks/story_benchmark.cc b/src/modular/benchmarks/story_benchmark.cc
index 2255d1f..ee31c6c 100644
--- a/src/modular/benchmarks/story_benchmark.cc
+++ b/src/modular/benchmarks/story_benchmark.cc
@@ -15,11 +15,11 @@
#include <src/lib/fxl/strings/string_number_conversions.h>
#include <trace/event.h>
-#include "peridot/lib/testing/session_shell_impl.h"
#include "src/modular/benchmarks/tracing_waiter.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_component.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_module.h"
#include "src/modular/lib/modular_test_harness/cpp/test_harness_fixture.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
namespace {
diff --git a/src/modular/lib/BUILD.gn b/src/modular/lib/BUILD.gn
index 210ed54..1fda55f 100644
--- a/src/modular/lib/BUILD.gn
+++ b/src/modular/lib/BUILD.gn
@@ -2,21 +2,30 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/fidl/fidl.gni")
import("//build/fidl/toolchain.gni")
group("lib") {
testonly = true
deps = [
":just_fidl",
+ ":maxwell_internal",
":services",
"agent",
"app_driver",
"async",
+ "bound_set",
+ "common",
"context",
+ "device_info",
"entity",
+ "fidl",
"integration_testing",
"lifecycle",
"message_queue",
+ "module_manifest",
+ "module_manifest_source",
+ "testing",
]
}
@@ -38,7 +47,18 @@
deps = [
"async/cpp:unittests",
"entity/cpp:unittests",
+ "fidl:unittests",
+ "modular_config:unittests",
"modular_test_harness/cpp:unittests",
+ "module_manifest:unittests",
"//src/lib/fxl/test:gtest_main",
]
}
+
+fidl("maxwell_internal") {
+ name = "fuchsia.maxwell.internal"
+
+ sources = [
+ "module_manifest_source/fidl/module_package_indexer.fidl",
+ ]
+}
diff --git a/peridot/lib/bound_set/BUILD.gn b/src/modular/lib/bound_set/BUILD.gn
similarity index 100%
rename from peridot/lib/bound_set/BUILD.gn
rename to src/modular/lib/bound_set/BUILD.gn
diff --git a/peridot/lib/bound_set/bound_set.h b/src/modular/lib/bound_set/bound_set.h
similarity index 96%
rename from peridot/lib/bound_set/bound_set.h
rename to src/modular/lib/bound_set/bound_set.h
index 674d858..f88ca40 100644
--- a/peridot/lib/bound_set/bound_set.h
+++ b/src/modular/lib/bound_set/bound_set.h
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_BOUND_SET_BOUND_SET_H_
-#define PERIDOT_LIB_BOUND_SET_BOUND_SET_H_
-
-#include <vector>
+#ifndef SRC_MODULAR_LIB_BOUND_SET_BOUND_SET_H_
+#define SRC_MODULAR_LIB_BOUND_SET_BOUND_SET_H_
#include <lib/fidl/cpp/binding.h>
#include <lib/fidl/cpp/interface_ptr.h>
+
+#include <vector>
+
#include <src/lib/fxl/logging.h>
namespace modular {
@@ -124,4 +125,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_BOUND_SET_BOUND_SET_H_
+#endif // SRC_MODULAR_LIB_BOUND_SET_BOUND_SET_H_
diff --git a/peridot/lib/common/BUILD.gn b/src/modular/lib/common/BUILD.gn
similarity index 100%
rename from peridot/lib/common/BUILD.gn
rename to src/modular/lib/common/BUILD.gn
diff --git a/peridot/lib/common/OWNERS b/src/modular/lib/common/OWNERS
similarity index 100%
rename from peridot/lib/common/OWNERS
rename to src/modular/lib/common/OWNERS
diff --git a/peridot/lib/common/async_holder.cc b/src/modular/lib/common/async_holder.cc
similarity index 97%
rename from peridot/lib/common/async_holder.cc
rename to src/modular/lib/common/async_holder.cc
index a453659..f251ca9 100644
--- a/peridot/lib/common/async_holder.cc
+++ b/src/modular/lib/common/async_holder.cc
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/common/async_holder.h"
+#include "src/modular/lib/common/async_holder.h"
#include <lib/async/cpp/task.h>
#include <lib/async/default.h>
+
#include <src/lib/fxl/logging.h>
namespace modular {
diff --git a/peridot/lib/common/async_holder.h b/src/modular/lib/common/async_holder.h
similarity index 95%
rename from peridot/lib/common/async_holder.h
rename to src/modular/lib/common/async_holder.h
index 3a9408e..9ec2e52 100644
--- a/peridot/lib/common/async_holder.h
+++ b/src/modular/lib/common/async_holder.h
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_COMMON_ASYNC_HOLDER_H_
-#define PERIDOT_LIB_COMMON_ASYNC_HOLDER_H_
+#ifndef SRC_MODULAR_LIB_COMMON_ASYNC_HOLDER_H_
+#define SRC_MODULAR_LIB_COMMON_ASYNC_HOLDER_H_
+
+#include <lib/fit/function.h>
+#include <lib/zx/time.h>
#include <functional>
#include <memory>
#include <string>
-#include <lib/fit/function.h>
-#include <lib/zx/time.h>
#include <src/lib/fxl/macros.h>
namespace modular {
@@ -109,4 +110,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_COMMON_ASYNC_HOLDER_H_
+#endif // SRC_MODULAR_LIB_COMMON_ASYNC_HOLDER_H_
diff --git a/peridot/lib/common/teardown.h b/src/modular/lib/common/teardown.h
similarity index 88%
rename from peridot/lib/common/teardown.h
rename to src/modular/lib/common/teardown.h
index 87ad9bd..577a4e2 100644
--- a/peridot/lib/common/teardown.h
+++ b/src/modular/lib/common/teardown.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_COMMON_TEARDOWN_H_
-#define PERIDOT_LIB_COMMON_TEARDOWN_H_
+#ifndef SRC_MODULAR_LIB_COMMON_TEARDOWN_H_
+#define SRC_MODULAR_LIB_COMMON_TEARDOWN_H_
#include <lib/zx/time.h>
@@ -32,4 +32,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_COMMON_TEARDOWN_H_
+#endif // SRC_MODULAR_LIB_COMMON_TEARDOWN_H_
diff --git a/peridot/lib/device_info/BUILD.gn b/src/modular/lib/device_info/BUILD.gn
similarity index 100%
rename from peridot/lib/device_info/BUILD.gn
rename to src/modular/lib/device_info/BUILD.gn
diff --git a/peridot/lib/device_info/device_info.cc b/src/modular/lib/device_info/device_info.cc
similarity index 98%
rename from peridot/lib/device_info/device_info.cc
rename to src/modular/lib/device_info/device_info.cc
index ea94b30..f61f91d9 100644
--- a/peridot/lib/device_info/device_info.cc
+++ b/src/modular/lib/device_info/device_info.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/device_info/device_info.h"
+#include "src/modular/lib/device_info/device_info.h"
#include <limits.h>
#include <unistd.h>
diff --git a/peridot/lib/device_info/device_info.h b/src/modular/lib/device_info/device_info.h
similarity index 84%
rename from peridot/lib/device_info/device_info.h
rename to src/modular/lib/device_info/device_info.h
index fde3c7a..a766e5f 100644
--- a/peridot/lib/device_info/device_info.h
+++ b/src/modular/lib/device_info/device_info.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_DEVICE_INFO_DEVICE_INFO_H_
-#define PERIDOT_LIB_DEVICE_INFO_DEVICE_INFO_H_
+#ifndef SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_INFO_H_
+#define SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_INFO_H_
#include <string>
@@ -28,4 +28,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_DEVICE_INFO_DEVICE_INFO_H_
+#endif // SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_INFO_H_
diff --git a/peridot/lib/device_info/device_profile.cc b/src/modular/lib/device_info/device_profile.cc
similarity index 100%
rename from peridot/lib/device_info/device_profile.cc
rename to src/modular/lib/device_info/device_profile.cc
diff --git a/peridot/lib/device_info/device_profile.h b/src/modular/lib/device_info/device_profile.h
similarity index 77%
rename from peridot/lib/device_info/device_profile.h
rename to src/modular/lib/device_info/device_profile.h
index 0890952..da6d1b4 100644
--- a/peridot/lib/device_info/device_profile.h
+++ b/src/modular/lib/device_info/device_profile.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
-#define PERIDOT_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
+#ifndef SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
+#define SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
#include <string>
#include <src/lib/fxl/macros.h>
-#include "peridot/lib/device_info/device_info.h"
+#include "src/modular/lib/device_info/device_info.h"
namespace modular {
@@ -31,4 +31,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
+#endif // SRC_MODULAR_LIB_DEVICE_INFO_DEVICE_PROFILE_H_
diff --git a/src/modular/lib/entity/BUILD.gn b/src/modular/lib/entity/BUILD.gn
index 0ccdf17..a5f9ccd 100644
--- a/src/modular/lib/entity/BUILD.gn
+++ b/src/modular/lib/entity/BUILD.gn
@@ -5,6 +5,22 @@
group("entity") {
testonly = true
deps = [
+ ":entity_watcher",
"cpp",
]
}
+
+source_set("entity_watcher") {
+ sources = [
+ "entity_watcher_impl.cc",
+ "entity_watcher_impl.h",
+ ]
+
+ public_deps = [
+ "//src/lib/fxl",
+ ]
+
+ deps = [
+ "//sdk/fidl/fuchsia.modular",
+ ]
+}
diff --git a/peridot/lib/entity/entity_watcher_impl.cc b/src/modular/lib/entity/entity_watcher_impl.cc
similarity index 93%
rename from peridot/lib/entity/entity_watcher_impl.cc
rename to src/modular/lib/entity/entity_watcher_impl.cc
index a69facf..345ee6e1 100644
--- a/peridot/lib/entity/entity_watcher_impl.cc
+++ b/src/modular/lib/entity/entity_watcher_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/entity/entity_watcher_impl.h"
+#include "src/modular/lib/entity/entity_watcher_impl.h"
namespace modular {
diff --git a/peridot/lib/entity/entity_watcher_impl.h b/src/modular/lib/entity/entity_watcher_impl.h
similarity index 89%
rename from peridot/lib/entity/entity_watcher_impl.h
rename to src/modular/lib/entity/entity_watcher_impl.h
index a5a1173..d47e09f 100644
--- a/peridot/lib/entity/entity_watcher_impl.h
+++ b/src/modular/lib/entity/entity_watcher_impl.h
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
-#define PERIDOT_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
-
-#include <memory>
+#ifndef SRC_MODULAR_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
+#define SRC_MODULAR_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
#include <lib/fit/function.h>
+
+#include <memory>
+
#include <src/lib/fxl/macros.h>
namespace modular {
@@ -43,4 +44,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
+#endif // SRC_MODULAR_LIB_ENTITY_ENTITY_WATCHER_IMPL_H_
diff --git a/peridot/lib/fidl/BUILD.gn b/src/modular/lib/fidl/BUILD.gn
similarity index 98%
rename from peridot/lib/fidl/BUILD.gn
rename to src/modular/lib/fidl/BUILD.gn
index 8f86665..2a9f991 100644
--- a/peridot/lib/fidl/BUILD.gn
+++ b/src/modular/lib/fidl/BUILD.gn
@@ -37,8 +37,8 @@
deps = [
"//garnet/public/lib/fsl",
"//garnet/public/lib/svc/cpp",
- "//peridot/lib/common:async_holder",
"//src/lib/fxl",
+ "//src/modular/lib/common:async_holder",
]
}
diff --git a/peridot/lib/fidl/README.md b/src/modular/lib/fidl/README.md
similarity index 100%
rename from peridot/lib/fidl/README.md
rename to src/modular/lib/fidl/README.md
diff --git a/peridot/lib/fidl/app_client.cc b/src/modular/lib/fidl/app_client.cc
similarity index 98%
rename from peridot/lib/fidl/app_client.cc
rename to src/modular/lib/fidl/app_client.cc
index 419f3d5..e0c3df2 100644
--- a/peridot/lib/fidl/app_client.cc
+++ b/src/modular/lib/fidl/app_client.cc
@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/app_client.h"
#include <fcntl.h>
-
#include <fuchsia/sys/cpp/fidl.h>
#include <lib/fdio/directory.h>
#include <lib/fdio/fd.h>
diff --git a/peridot/lib/fidl/app_client.h b/src/modular/lib/fidl/app_client.h
similarity index 95%
rename from peridot/lib/fidl/app_client.h
rename to src/modular/lib/fidl/app_client.h
index c65183c..a1bc43a 100644
--- a/peridot/lib/fidl/app_client.h
+++ b/src/modular/lib/fidl/app_client.h
@@ -2,21 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_APP_CLIENT_H_
-#define PERIDOT_LIB_FIDL_APP_CLIENT_H_
-
-#include <memory>
-#include <string>
+#ifndef SRC_MODULAR_LIB_FIDL_APP_CLIENT_H_
+#define SRC_MODULAR_LIB_FIDL_APP_CLIENT_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
#include <lib/fidl/cpp/interface_request.h>
#include <lib/svc/cpp/services.h>
+
+#include <memory>
+#include <string>
+
#include <src/lib/fxl/macros.h>
#include <src/lib/fxl/time/time_delta.h>
-#include "peridot/lib/common/async_holder.h"
+#include "src/modular/lib/common/async_holder.h"
namespace modular {
@@ -111,4 +112,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_APP_CLIENT_H_
+#endif // SRC_MODULAR_LIB_FIDL_APP_CLIENT_H_
diff --git a/peridot/lib/fidl/app_client_unittest.cc b/src/modular/lib/fidl/app_client_unittest.cc
similarity index 98%
rename from peridot/lib/fidl/app_client_unittest.cc
rename to src/modular/lib/fidl/app_client_unittest.cc
index 4dd9853..f427dcd 100644
--- a/peridot/lib/fidl/app_client_unittest.cc
+++ b/src/modular/lib/fidl/app_client_unittest.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/app_client.h"
+#include "src/modular/lib/fidl/app_client.h"
#include <fuchsia/sys/cpp/fidl.h>
#include <lib/gtest/test_loop_fixture.h>
#include <lib/sys/cpp/testing/fake_launcher.h>
+
#include <test/peridot/lib/fidl/appclient/cpp/fidl.h>
#include "gtest/gtest.h"
diff --git a/peridot/lib/fidl/app_client_unittest.fidl b/src/modular/lib/fidl/app_client_unittest.fidl
similarity index 100%
rename from peridot/lib/fidl/app_client_unittest.fidl
rename to src/modular/lib/fidl/app_client_unittest.fidl
diff --git a/peridot/lib/fidl/array_to_string.h b/src/modular/lib/fidl/array_to_string.h
similarity index 92%
rename from peridot/lib/fidl/array_to_string.h
rename to src/modular/lib/fidl/array_to_string.h
index d48f1167..9eff136 100644
--- a/peridot/lib/fidl/array_to_string.h
+++ b/src/modular/lib/fidl/array_to_string.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_ARRAY_TO_STRING_H_
-#define PERIDOT_LIB_FIDL_ARRAY_TO_STRING_H_
+#ifndef SRC_MODULAR_LIB_FIDL_ARRAY_TO_STRING_H_
+#define SRC_MODULAR_LIB_FIDL_ARRAY_TO_STRING_H_
+
+#include <lib/fidl/cpp/string.h>
+#include <lib/fidl/cpp/vector.h>
#include <array>
#include <string>
#include <vector>
-#include <lib/fidl/cpp/string.h>
-#include <lib/fidl/cpp/vector.h>
-
namespace modular {
inline std::string to_string(const std::array<uint8_t, 16>& data) {
@@ -70,4 +70,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_ARRAY_TO_STRING_H_
+#endif // SRC_MODULAR_LIB_FIDL_ARRAY_TO_STRING_H_
diff --git a/peridot/lib/fidl/clone.h b/src/modular/lib/fidl/clone.h
similarity index 87%
rename from peridot/lib/fidl/clone.h
rename to src/modular/lib/fidl/clone.h
index 6836d9f..ba4e6d6 100644
--- a/peridot/lib/fidl/clone.h
+++ b/src/modular/lib/fidl/clone.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_CLONE_H_
-#define PERIDOT_LIB_FIDL_CLONE_H_
-
-#include <memory>
+#ifndef SRC_MODULAR_LIB_FIDL_CLONE_H_
+#define SRC_MODULAR_LIB_FIDL_CLONE_H_
#include <lib/fidl/cpp/optional.h>
#include <lib/fidl/cpp/vector.h>
+#include <memory>
+
namespace modular {
template <typename T>
@@ -38,4 +38,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_CLONE_H_
+#endif // SRC_MODULAR_LIB_FIDL_CLONE_H_
diff --git a/peridot/lib/fidl/environment.cc b/src/modular/lib/fidl/environment.cc
similarity index 97%
rename from peridot/lib/fidl/environment.cc
rename to src/modular/lib/fidl/environment.cc
index f020dca..ee32489 100644
--- a/peridot/lib/fidl/environment.cc
+++ b/src/modular/lib/fidl/environment.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/environment.h"
+#include "src/modular/lib/fidl/environment.h"
#include <lib/async/default.h>
+
#include <src/lib/fxl/logging.h>
namespace modular {
diff --git a/peridot/lib/fidl/environment.h b/src/modular/lib/fidl/environment.h
similarity index 94%
rename from peridot/lib/fidl/environment.h
rename to src/modular/lib/fidl/environment.h
index 617ffc3..64dae0e 100644
--- a/peridot/lib/fidl/environment.h
+++ b/src/modular/lib/fidl/environment.h
@@ -2,8 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_ENVIRONMENT_H_
-#define PERIDOT_LIB_FIDL_ENVIRONMENT_H_
+#ifndef SRC_MODULAR_LIB_FIDL_ENVIRONMENT_H_
+#define SRC_MODULAR_LIB_FIDL_ENVIRONMENT_H_
+
+#include <fuchsia/sys/cpp/fidl.h>
+#include <lib/fidl/cpp/binding.h>
+#include <lib/fidl/cpp/interface_request.h>
+#include <lib/fit/function.h>
+#include <lib/sys/cpp/component_context.h>
#include <memory>
#include <string>
@@ -13,11 +19,6 @@
#include <fs/pseudo-dir.h>
#include <fs/service.h>
#include <fs/synchronous-vfs.h>
-#include <fuchsia/sys/cpp/fidl.h>
-#include <lib/fidl/cpp/binding.h>
-#include <lib/fidl/cpp/interface_request.h>
-#include <lib/fit/function.h>
-#include <lib/sys/cpp/component_context.h>
namespace modular {
@@ -66,4 +67,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_ENVIRONMENT_H_
+#endif // SRC_MODULAR_LIB_FIDL_ENVIRONMENT_H_
diff --git a/peridot/lib/fidl/json_xdr.cc b/src/modular/lib/fidl/json_xdr.cc
similarity index 99%
rename from peridot/lib/fidl/json_xdr.cc
rename to src/modular/lib/fidl/json_xdr.cc
index d08be67..c66b066 100644
--- a/peridot/lib/fidl/json_xdr.cc
+++ b/src/modular/lib/fidl/json_xdr.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+
+#include <lib/fidl/cpp/string.h>
#include <string>
-#include <lib/fidl/cpp/string.h>
#include <src/lib/fxl/macros.h>
#include "peridot/lib/rapidjson/rapidjson.h"
diff --git a/peridot/lib/fidl/json_xdr.h b/src/modular/lib/fidl/json_xdr.h
similarity index 99%
rename from peridot/lib/fidl/json_xdr.h
rename to src/modular/lib/fidl/json_xdr.h
index 3d1d2e7..68f9e7e 100644
--- a/peridot/lib/fidl/json_xdr.h
+++ b/src/modular/lib/fidl/json_xdr.h
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_JSON_XDR_H_
-#define PERIDOT_LIB_FIDL_JSON_XDR_H_
+#ifndef SRC_MODULAR_LIB_FIDL_JSON_XDR_H_
+#define SRC_MODULAR_LIB_FIDL_JSON_XDR_H_
+
+#include <lib/fidl/cpp/string.h>
#include <array>
#include <map>
@@ -11,7 +13,6 @@
#include <type_traits>
#include <vector>
-#include <lib/fidl/cpp/string.h>
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/macros.h>
@@ -820,4 +821,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_JSON_XDR_H_
+#endif // SRC_MODULAR_LIB_FIDL_JSON_XDR_H_
diff --git a/peridot/lib/fidl/json_xdr_unittest.cc b/src/modular/lib/fidl/json_xdr_unittest.cc
similarity index 99%
rename from peridot/lib/fidl/json_xdr_unittest.cc
rename to src/modular/lib/fidl/json_xdr_unittest.cc
index 6609c04..1ef4f50 100644
--- a/peridot/lib/fidl/json_xdr_unittest.cc
+++ b/src/modular/lib/fidl/json_xdr_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
#include <map>
#include <vector>
diff --git a/peridot/lib/fidl/json_xdr_unittest.fidl b/src/modular/lib/fidl/json_xdr_unittest.fidl
similarity index 100%
rename from peridot/lib/fidl/json_xdr_unittest.fidl
rename to src/modular/lib/fidl/json_xdr_unittest.fidl
diff --git a/peridot/lib/fidl/proxy.cc b/src/modular/lib/fidl/proxy.cc
similarity index 94%
rename from peridot/lib/fidl/proxy.cc
rename to src/modular/lib/fidl/proxy.cc
index 4f42da4..53062d5 100644
--- a/peridot/lib/fidl/proxy.cc
+++ b/src/modular/lib/fidl/proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/proxy.h"
+#include "src/modular/lib/fidl/proxy.h"
#include <src/lib/fxl/logging.h>
diff --git a/peridot/lib/fidl/proxy.h b/src/modular/lib/fidl/proxy.h
similarity index 94%
rename from peridot/lib/fidl/proxy.h
rename to src/modular/lib/fidl/proxy.h
index c534696..c505eec 100644
--- a/peridot/lib/fidl/proxy.h
+++ b/src/modular/lib/fidl/proxy.h
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_PROXY_H_
-#define PERIDOT_LIB_FIDL_PROXY_H_
+#ifndef SRC_MODULAR_LIB_FIDL_PROXY_H_
+#define SRC_MODULAR_LIB_FIDL_PROXY_H_
+
+#include <lib/fidl/cpp/binding.h>
+#include <lib/fidl/cpp/interface_request.h>
#include <memory>
#include <vector>
-#include <lib/fidl/cpp/binding.h>
-#include <lib/fidl/cpp/interface_request.h>
#include <src/lib/fxl/macros.h>
namespace modular {
@@ -88,4 +89,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_PROXY_H_
+#endif // SRC_MODULAR_LIB_FIDL_PROXY_H_
diff --git a/peridot/lib/fidl/single_service_app.h b/src/modular/lib/fidl/single_service_app.h
similarity index 94%
rename from peridot/lib/fidl/single_service_app.h
rename to src/modular/lib/fidl/single_service_app.h
index ed129e1..8f44335 100644
--- a/peridot/lib/fidl/single_service_app.h
+++ b/src/modular/lib/fidl/single_service_app.h
@@ -2,16 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_SINGLE_SERVICE_APP_H_
-#define PERIDOT_LIB_FIDL_SINGLE_SERVICE_APP_H_
-
-#include <memory>
+#ifndef SRC_MODULAR_LIB_FIDL_SINGLE_SERVICE_APP_H_
+#define SRC_MODULAR_LIB_FIDL_SINGLE_SERVICE_APP_H_
#include <fuchsia/sys/cpp/fidl.h>
#include <fuchsia/ui/app/cpp/fidl.h>
#include <lib/fidl/cpp/interface_request.h>
#include <lib/sys/cpp/component_context.h>
#include <lib/zx/eventpair.h>
+
+#include <memory>
+
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/macros.h>
@@ -77,4 +78,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_SINGLE_SERVICE_APP_H_
+#endif // SRC_MODULAR_LIB_FIDL_SINGLE_SERVICE_APP_H_
diff --git a/peridot/lib/fidl/view_host.cc b/src/modular/lib/fidl/view_host.cc
similarity index 97%
rename from peridot/lib/fidl/view_host.cc
rename to src/modular/lib/fidl/view_host.cc
index f972b76..5b8741c 100644
--- a/peridot/lib/fidl/view_host.cc
+++ b/src/modular/lib/fidl/view_host.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/fidl/view_host.h"
+#include "src/modular/lib/fidl/view_host.h"
#include <fuchsia/ui/scenic/cpp/fidl.h>
diff --git a/peridot/lib/fidl/view_host.h b/src/modular/lib/fidl/view_host.h
similarity index 93%
rename from peridot/lib/fidl/view_host.h
rename to src/modular/lib/fidl/view_host.h
index c5b3097..bc5a93b 100644
--- a/peridot/lib/fidl/view_host.h
+++ b/src/modular/lib/fidl/view_host.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_FIDL_VIEW_HOST_H_
-#define PERIDOT_LIB_FIDL_VIEW_HOST_H_
+#ifndef SRC_MODULAR_LIB_FIDL_VIEW_HOST_H_
+#define SRC_MODULAR_LIB_FIDL_VIEW_HOST_H_
#include <fuchsia/ui/gfx/cpp/fidl.h>
#include <fuchsia/ui/views/cpp/fidl.h>
@@ -64,4 +64,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_FIDL_VIEW_HOST_H_
+#endif // SRC_MODULAR_LIB_FIDL_VIEW_HOST_H_
diff --git a/peridot/lib/modular_config/BUILD.gn b/src/modular/lib/modular_config/BUILD.gn
similarity index 94%
rename from peridot/lib/modular_config/BUILD.gn
rename to src/modular/lib/modular_config/BUILD.gn
index 25d590d..fc72755 100644
--- a/peridot/lib/modular_config/BUILD.gn
+++ b/src/modular/lib/modular_config/BUILD.gn
@@ -14,10 +14,10 @@
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
"//garnet/public/lib/json",
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.internal",
"//sdk/fidl/fuchsia.modular.session",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -29,10 +29,10 @@
]
deps = [
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.modular.internal",
"//sdk/fidl/fuchsia.modular.session",
+ "//src/modular/lib/fidl:json_xdr",
]
}
diff --git a/peridot/lib/modular_config/modular_config.cc b/src/modular/lib/modular_config/modular_config.cc
similarity index 94%
rename from peridot/lib/modular_config/modular_config.cc
rename to src/modular/lib/modular_config/modular_config.cc
index d431fdfe..f4e6be1 100644
--- a/peridot/lib/modular_config/modular_config.cc
+++ b/src/modular/lib/modular_config/modular_config.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/modular_config/modular_config.h"
+#include "src/modular/lib/modular_config/modular_config.h"
#include <fcntl.h>
#include <src/lib/fxl/strings/substitute.h>
-#include "peridot/lib/fidl/json_xdr.h"
-#include "peridot/lib/modular_config/modular_config_constants.h"
-#include "peridot/lib/modular_config/modular_config_xdr.h"
#include "src/lib/files/directory.h"
#include "src/lib/files/file.h"
#include "src/lib/files/path.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
+#include "src/modular/lib/modular_config/modular_config_xdr.h"
namespace modular {
namespace {
diff --git a/peridot/lib/modular_config/modular_config.h b/src/modular/lib/modular_config/modular_config.h
similarity index 92%
rename from peridot/lib/modular_config/modular_config.h
rename to src/modular/lib/modular_config/modular_config.h
index a541580..a70dd0c 100644
--- a/peridot/lib/modular_config/modular_config.h
+++ b/src/modular/lib/modular_config/modular_config.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
-#define PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
+#ifndef SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
+#define SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
#include <fuchsia/modular/session/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
@@ -63,4 +63,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
+#endif // SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_H_
diff --git a/peridot/lib/modular_config/modular_config_constants.h b/src/modular/lib/modular_config/modular_config_constants.h
similarity index 94%
rename from peridot/lib/modular_config/modular_config_constants.h
rename to src/modular/lib/modular_config/modular_config_constants.h
index de179b4..98eac45 100644
--- a/peridot/lib/modular_config/modular_config_constants.h
+++ b/src/modular/lib/modular_config/modular_config_constants.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
-#define PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
+#ifndef SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
+#define SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
namespace modular_config {
@@ -88,4 +88,4 @@
} // namespace modular_config
-#endif // PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
+#endif // SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_CONSTANTS_H_
diff --git a/peridot/lib/modular_config/modular_config_unittest.cc b/src/modular/lib/modular_config/modular_config_unittest.cc
similarity index 97%
rename from peridot/lib/modular_config/modular_config_unittest.cc
rename to src/modular/lib/modular_config/modular_config_unittest.cc
index 63145d1..241e29c 100644
--- a/peridot/lib/modular_config/modular_config_unittest.cc
+++ b/src/modular/lib/modular_config/modular_config_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/modular_config/modular_config.h"
-
-#include <thread>
+#include "src/modular/lib/modular_config/modular_config.h"
#include <lib/fsl/io/fd.h>
#include <lib/sys/cpp/testing/test_with_environment.h>
#include <lib/vfs/cpp/pseudo_dir.h>
#include <lib/vfs/cpp/pseudo_file.h>
-#include <peridot/lib/modular_config/modular_config_constants.h>
+
+#include <thread>
+
#include <peridot/lib/util/pseudo_dir_server.h>
#include <peridot/lib/util/pseudo_dir_utils.h>
#include <src/lib/files/file.h>
@@ -18,6 +18,7 @@
#include <src/lib/files/unique_fd.h>
#include <src/lib/fxl/strings/split_string.h>
#include <src/lib/fxl/strings/substitute.h>
+#include <src/modular/lib/modular_config/modular_config_constants.h>
class ModularConfigReaderTest : public gtest::RealLoopFixture {};
diff --git a/peridot/lib/modular_config/modular_config_xdr.cc b/src/modular/lib/modular_config/modular_config_xdr.cc
similarity index 98%
rename from peridot/lib/modular_config/modular_config_xdr.cc
rename to src/modular/lib/modular_config/modular_config_xdr.cc
index 0a100ae..84c5ad1 100644
--- a/peridot/lib/modular_config/modular_config_xdr.cc
+++ b/src/modular/lib/modular_config/modular_config_xdr.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/modular_config/modular_config_xdr.h"
+#include "src/modular/lib/modular_config/modular_config_xdr.h"
-#include "peridot/lib/modular_config/modular_config_constants.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
namespace modular {
namespace {
diff --git a/peridot/lib/modular_config/modular_config_xdr.h b/src/modular/lib/modular_config/modular_config_xdr.h
similarity index 79%
rename from peridot/lib/modular_config/modular_config_xdr.h
rename to src/modular/lib/modular_config/modular_config_xdr.h
index 88a83d8..5b72391 100644
--- a/peridot/lib/modular_config/modular_config_xdr.h
+++ b/src/modular/lib/modular_config/modular_config_xdr.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
-#define PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
+#ifndef SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
+#define SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
#include <fuchsia/modular/session/cpp/fidl.h>
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
@@ -31,4 +31,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
+#endif // SRC_MODULAR_LIB_MODULAR_CONFIG_MODULAR_CONFIG_XDR_H_
diff --git a/peridot/lib/modular_config/modular_config_xdr_unittest.cc b/src/modular/lib/modular_config/modular_config_xdr_unittest.cc
similarity index 98%
rename from peridot/lib/modular_config/modular_config_xdr_unittest.cc
rename to src/modular/lib/modular_config/modular_config_xdr_unittest.cc
index 77f60a5b..7a3922e 100644
--- a/peridot/lib/modular_config/modular_config_xdr_unittest.cc
+++ b/src/modular/lib/modular_config/modular_config_xdr_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/modular_config/modular_config_xdr.h"
-
-#include <algorithm>
-#include <cctype>
+#include "src/modular/lib/modular_config/modular_config_xdr.h"
#include <fuchsia/modular/internal/cpp/fidl.h>
#include <fuchsia/modular/session/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
+#include <algorithm>
+#include <cctype>
+
#include "gtest/gtest.h"
#include "src/lib/files/file.h"
diff --git a/src/modular/lib/modular_test_harness/cpp/BUILD.gn b/src/modular/lib/modular_test_harness/cpp/BUILD.gn
index e7b0e1a..e9edb68 100644
--- a/src/modular/lib/modular_test_harness/cpp/BUILD.gn
+++ b/src/modular/lib/modular_test_harness/cpp/BUILD.gn
@@ -41,10 +41,10 @@
deps = [
"//garnet/public/lib/svc/cpp",
- "//peridot/lib/testing:session_shell_impl",
"//sdk/fidl/fuchsia.modular.testing",
"//sdk/lib/sys/cpp",
"//sdk/lib/sys/cpp/testing:integration",
+ "//src/modular/lib/testing:session_shell_impl",
"//third_party/googletest:gtest",
]
}
@@ -98,7 +98,6 @@
public_deps = [
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
- "//peridot/lib/modular_config",
"//sdk/fidl/fuchsia.auth.account",
"//sdk/fidl/fuchsia.devicesettings",
"//sdk/fidl/fuchsia.modular",
@@ -107,13 +106,14 @@
"//sdk/fidl/fuchsia.sys",
"//sdk/lib/sys/cpp/testing:enclosing_environment",
"//src/modular/lib/app_driver/cpp:agent_driver",
+ "//src/modular/lib/modular_config",
"//zircon/public/lib/async-loop-cpp",
]
deps = [
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/modular_config:json_xdr",
"//peridot/lib/util:pseudo_dir_utils",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/modular_config:json_xdr",
]
}
@@ -126,7 +126,6 @@
deps = [
":test_harness_impl",
- "//peridot/lib/modular_config",
"//peridot/lib/rapidjson",
"//peridot/lib/util:pseudo_dir_server",
"//sdk/fidl/fuchsia.modular",
@@ -134,6 +133,7 @@
"//sdk/lib/sys/cpp/testing:integration",
"//sdk/lib/sys/cpp/testing:unit",
"//src/lib/fxl/test:gtest_main",
+ "//src/modular/lib/modular_config",
"//zircon/public/lib/fidl",
]
}
diff --git a/src/modular/lib/modular_test_harness/cpp/fake_session_shell.h b/src/modular/lib/modular_test_harness/cpp/fake_session_shell.h
index 50b41f8..5265d6f 100644
--- a/src/modular/lib/modular_test_harness/cpp/fake_session_shell.h
+++ b/src/modular/lib/modular_test_harness/cpp/fake_session_shell.h
@@ -7,8 +7,8 @@
#include <sdk/lib/sys/cpp/component_context.h>
-#include "peridot/lib/testing/session_shell_impl.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_component.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
namespace modular {
namespace testing {
diff --git a/src/modular/lib/modular_test_harness/cpp/test_harness_impl.cc b/src/modular/lib/modular_test_harness/cpp/test_harness_impl.cc
index 86e7122..0a17232 100644
--- a/src/modular/lib/modular_test_harness/cpp/test_harness_impl.cc
+++ b/src/modular/lib/modular_test_harness/cpp/test_harness_impl.cc
@@ -12,9 +12,6 @@
#include <lib/vfs/cpp/pseudo_file.h>
#include <zircon/status.h>
-#include <peridot/lib/modular_config/modular_config.h>
-#include <peridot/lib/modular_config/modular_config_constants.h>
-#include <peridot/lib/modular_config/modular_config_xdr.h>
#include <peridot/lib/util/pseudo_dir_utils.h>
#include <src/lib/files/path.h>
#include <src/lib/files/unique_fd.h>
@@ -22,6 +19,9 @@
#include <src/lib/fxl/strings/join_strings.h>
#include <src/lib/fxl/strings/split_string.h>
#include <src/lib/fxl/strings/substitute.h>
+#include <src/modular/lib/modular_config/modular_config.h>
+#include <src/modular/lib/modular_config/modular_config_constants.h>
+#include <src/modular/lib/modular_config/modular_config_xdr.h>
namespace modular::testing {
namespace {
diff --git a/src/modular/lib/modular_test_harness/cpp/test_harness_impl_unittest.cc b/src/modular/lib/modular_test_harness/cpp/test_harness_impl_unittest.cc
index d1a6bae..52fb400 100644
--- a/src/modular/lib/modular_test_harness/cpp/test_harness_impl_unittest.cc
+++ b/src/modular/lib/modular_test_harness/cpp/test_harness_impl_unittest.cc
@@ -11,13 +11,13 @@
#include <thread>
-#include <peridot/lib/modular_config/modular_config.h>
-#include <peridot/lib/modular_config/modular_config_constants.h>
#include <peridot/lib/util/pseudo_dir_server.h>
#include <src/lib/files/file.h>
#include <src/lib/files/path.h>
#include <src/lib/fxl/strings/split_string.h>
#include <src/lib/fxl/strings/substitute.h>
+#include <src/modular/lib/modular_config/modular_config.h>
+#include <src/modular/lib/modular_config/modular_config_constants.h>
#include "gtest/gtest.h"
diff --git a/peridot/lib/module_manifest/BUILD.gn b/src/modular/lib/module_manifest/BUILD.gn
similarity index 93%
rename from peridot/lib/module_manifest/BUILD.gn
rename to src/modular/lib/module_manifest/BUILD.gn
index f44d4a6..1700d27 100644
--- a/peridot/lib/module_manifest/BUILD.gn
+++ b/src/modular/lib/module_manifest/BUILD.gn
@@ -39,11 +39,11 @@
"//garnet/public/lib/cmx_facet_parser",
"//garnet/public/lib/fsl",
"//garnet/public/lib/json",
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
"//sdk/fidl/fuchsia.sys",
"//sdk/lib/sys/cpp",
"//src/lib/pkg_url",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -72,8 +72,8 @@
]
deps = [
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
+ "//src/modular/lib/fidl:json_xdr",
]
}
@@ -86,8 +86,8 @@
deps = [
":json_xdr",
- "//peridot/lib/fidl:json_xdr",
"//sdk/fidl/fuchsia.modular",
+ "//src/modular/lib/fidl:json_xdr",
"//third_party/googletest:gtest",
]
}
diff --git a/peridot/lib/module_manifest/module_facet_reader.h b/src/modular/lib/module_manifest/module_facet_reader.h
similarity index 82%
rename from peridot/lib/module_manifest/module_facet_reader.h
rename to src/modular/lib/module_manifest/module_facet_reader.h
index 327a3a5..ee55712 100644
--- a/peridot/lib/module_manifest/module_facet_reader.h
+++ b/src/modular/lib/module_manifest/module_facet_reader.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
-
-#include <string>
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
#include <fuchsia/modular/cpp/fidl.h>
+#include <string>
+
namespace modular {
// |ModuleFacetReader| provides a way to read the the module facet declared in
@@ -28,4 +28,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_H_
diff --git a/peridot/lib/module_manifest/module_facet_reader_impl.cc b/src/modular/lib/module_manifest/module_facet_reader_impl.cc
similarity index 93%
rename from peridot/lib/module_manifest/module_facet_reader_impl.cc
rename to src/modular/lib/module_manifest/module_facet_reader_impl.cc
index a2c144d..636967a 100644
--- a/peridot/lib/module_manifest/module_facet_reader_impl.cc
+++ b/src/modular/lib/module_manifest/module_facet_reader_impl.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest/module_facet_reader_impl.h"
+#include "src/modular/lib/module_manifest/module_facet_reader_impl.h"
#include "lib/cmx_facet_parser/cmx_facet_parser.h"
#include "lib/fsl/io/fd.h"
#include "lib/json/json_parser.h"
#include "lib/sys/cpp/component_context.h"
-#include "peridot/lib/fidl/json_xdr.h"
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
#include "src/lib/pkg_url/fuchsia_pkg_url.h"
#include "src/lib/pkg_url/url_resolver.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
namespace modular {
namespace {
diff --git a/peridot/lib/module_manifest/module_facet_reader_impl.h b/src/modular/lib/module_manifest/module_facet_reader_impl.h
similarity index 75%
rename from peridot/lib/module_manifest/module_facet_reader_impl.h
rename to src/modular/lib/module_manifest/module_facet_reader_impl.h
index f5abb69..cd82ef8 100644
--- a/peridot/lib/module_manifest/module_facet_reader_impl.h
+++ b/src/modular/lib/module_manifest/module_facet_reader_impl.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
#include <fuchsia/sys/cpp/fidl.h>
-#include "peridot/lib/module_manifest/module_facet_reader.h"
#include "src/lib/fxl/macros.h"
+#include "src/modular/lib/module_manifest/module_facet_reader.h"
namespace modular {
@@ -30,4 +30,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_FACET_READER_IMPL_H_
diff --git a/peridot/lib/module_manifest/module_facet_reader_impl_unittest.cc b/src/modular/lib/module_manifest/module_facet_reader_impl_unittest.cc
similarity index 98%
rename from peridot/lib/module_manifest/module_facet_reader_impl_unittest.cc
rename to src/modular/lib/module_manifest/module_facet_reader_impl_unittest.cc
index b83d2a9..84a08a6 100644
--- a/peridot/lib/module_manifest/module_facet_reader_impl_unittest.cc
+++ b/src/modular/lib/module_manifest/module_facet_reader_impl_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest/module_facet_reader_impl.h"
+#include "src/modular/lib/module_manifest/module_facet_reader_impl.h"
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/peridot/lib/module_manifest/module_manifest_xdr.cc b/src/modular/lib/module_manifest/module_manifest_xdr.cc
similarity index 96%
rename from peridot/lib/module_manifest/module_manifest_xdr.cc
rename to src/modular/lib/module_manifest/module_manifest_xdr.cc
index ee8a23b..5c97c2c 100644
--- a/peridot/lib/module_manifest/module_manifest_xdr.cc
+++ b/src/modular/lib/module_manifest/module_manifest_xdr.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
namespace modular {
namespace {
diff --git a/peridot/lib/module_manifest/module_manifest_xdr.h b/src/modular/lib/module_manifest/module_manifest_xdr.h
similarity index 69%
rename from peridot/lib/module_manifest/module_manifest_xdr.h
rename to src/modular/lib/module_manifest/module_manifest_xdr.h
index b8bf522..5e27136 100644
--- a/peridot/lib/module_manifest/module_manifest_xdr.h
+++ b/src/modular/lib/module_manifest/module_manifest_xdr.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
#include <fuchsia/modular/cpp/fidl.h>
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
namespace modular {
@@ -19,4 +19,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_MODULE_MANIFEST_XDR_H_
diff --git a/peridot/lib/module_manifest/module_manifest_xdr_unittest.cc b/src/modular/lib/module_manifest/module_manifest_xdr_unittest.cc
similarity index 94%
rename from peridot/lib/module_manifest/module_manifest_xdr_unittest.cc
rename to src/modular/lib/module_manifest/module_manifest_xdr_unittest.cc
index a0c2fc9..6662ccb 100644
--- a/peridot/lib/module_manifest/module_manifest_xdr_unittest.cc
+++ b/src/modular/lib/module_manifest/module_manifest_xdr_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
#include "gtest/gtest.h"
-#include "peridot/lib/fidl/json_xdr.h"
+#include "src/modular/lib/fidl/json_xdr.h"
void ExpectBasicManifest(const char manifest_str[]) {
fuchsia::modular::ModuleManifest m;
diff --git a/peridot/lib/module_manifest_source/BUILD.gn b/src/modular/lib/module_manifest_source/BUILD.gn
similarity index 85%
rename from peridot/lib/module_manifest_source/BUILD.gn
rename to src/modular/lib/module_manifest_source/BUILD.gn
index fa04cff..79da9a4 100644
--- a/peridot/lib/module_manifest_source/BUILD.gn
+++ b/src/modular/lib/module_manifest_source/BUILD.gn
@@ -23,9 +23,9 @@
deps = [
":module_manifest_source",
- "//peridot/lib/fidl:json_xdr",
- "//peridot/lib/module_manifest:json_xdr",
"//peridot/lib/rapidjson",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/module_manifest:json_xdr",
"//third_party/rapidjson",
]
}
@@ -39,11 +39,11 @@
public_deps = [
":module_manifest_source",
"//garnet/public/lib/fsl",
- "//peridot/lib/fidl:json_xdr",
"//peridot/lib/firebase",
- "//peridot/lib/module_manifest:json_xdr",
"//sdk/fidl/fuchsia.net.oldhttp",
"//src/lib/fxl",
+ "//src/modular/lib/fidl:json_xdr",
+ "//src/modular/lib/module_manifest:json_xdr",
"//third_party/rapidjson",
]
}
@@ -69,8 +69,8 @@
":json",
":module_manifest_source",
":package_util",
- "//peridot/lib:maxwell_internal",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
+ "//src/modular/lib:maxwell_internal",
]
}
diff --git a/peridot/lib/module_manifest_source/fidl/module_package_indexer.fidl b/src/modular/lib/module_manifest_source/fidl/module_package_indexer.fidl
similarity index 100%
rename from peridot/lib/module_manifest_source/fidl/module_package_indexer.fidl
rename to src/modular/lib/module_manifest_source/fidl/module_package_indexer.fidl
diff --git a/peridot/lib/module_manifest_source/firebase_source.cc b/src/modular/lib/module_manifest_source/firebase_source.cc
similarity index 96%
rename from peridot/lib/module_manifest_source/firebase_source.cc
rename to src/modular/lib/module_manifest_source/firebase_source.cc
index e744cff..a028cff 100644
--- a/peridot/lib/module_manifest_source/firebase_source.cc
+++ b/src/modular/lib/module_manifest_source/firebase_source.cc
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest_source/firebase_source.h"
+#include "src/modular/lib/module_manifest_source/firebase_source.h"
#include <errno.h>
#include <fcntl.h>
+#include <lib/async/cpp/task.h>
+#include <lib/backoff/exponential_backoff.h>
+#include <lib/fdio/watcher.h>
+#include <lib/network_wrapper/network_wrapper_impl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <thread>
-#include <lib/async/cpp/task.h>
-#include <lib/backoff/exponential_backoff.h>
-#include <lib/fdio/watcher.h>
-#include <lib/network_wrapper/network_wrapper_impl.h>
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/fidl/json_xdr.h"
#include "peridot/lib/firebase/firebase_impl.h"
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
#include "rapidjson/document.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
namespace modular {
diff --git a/peridot/lib/module_manifest_source/firebase_source.h b/src/modular/lib/module_manifest_source/firebase_source.h
similarity index 84%
rename from peridot/lib/module_manifest_source/firebase_source.h
rename to src/modular/lib/module_manifest_source/firebase_source.h
index 2714d0c..fa03abf 100644
--- a/peridot/lib/module_manifest_source/firebase_source.h
+++ b/src/modular/lib/module_manifest_source/firebase_source.h
@@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
+
+#include <fuchsia/net/oldhttp/cpp/fidl.h>
#include <functional>
#include <map>
#include <string>
#include <vector>
-#include <fuchsia/net/oldhttp/cpp/fidl.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/module_manifest_source/module_manifest_source.h"
+#include "src/modular/lib/module_manifest_source/module_manifest_source.h"
namespace firebase {
class Firebase;
@@ -63,4 +64,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_FIREBASE_SOURCE_H_
diff --git a/peridot/lib/module_manifest_source/json.cc b/src/modular/lib/module_manifest_source/json.cc
similarity index 88%
rename from peridot/lib/module_manifest_source/json.cc
rename to src/modular/lib/module_manifest_source/json.cc
index 11f3731..3325984 100644
--- a/peridot/lib/module_manifest_source/json.cc
+++ b/src/modular/lib/module_manifest_source/json.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest_source/json.h"
+#include "src/modular/lib/module_manifest_source/json.h"
-#include "peridot/lib/fidl/json_xdr.h"
-#include "peridot/lib/module_manifest/module_manifest_xdr.h"
#include "peridot/lib/rapidjson/rapidjson.h"
#include "rapidjson/document.h"
+#include "src/modular/lib/fidl/json_xdr.h"
+#include "src/modular/lib/module_manifest/module_manifest_xdr.h"
namespace modular {
diff --git a/peridot/lib/module_manifest_source/json.h b/src/modular/lib/module_manifest_source/json.h
similarity index 62%
rename from peridot/lib/module_manifest_source/json.h
rename to src/modular/lib/module_manifest_source/json.h
index ede1336..3b17513 100644
--- a/peridot/lib/module_manifest_source/json.h
+++ b/src/modular/lib/module_manifest_source/json.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
-#include "peridot/lib/module_manifest_source/module_manifest_source.h"
+#include "src/modular/lib/module_manifest_source/module_manifest_source.h"
namespace modular {
@@ -14,4 +14,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_JSON_H_
diff --git a/peridot/lib/module_manifest_source/module_manifest_source.cc b/src/modular/lib/module_manifest_source/module_manifest_source.cc
similarity index 78%
rename from peridot/lib/module_manifest_source/module_manifest_source.cc
rename to src/modular/lib/module_manifest_source/module_manifest_source.cc
index b65ec68..196f525 100644
--- a/peridot/lib/module_manifest_source/module_manifest_source.cc
+++ b/src/modular/lib/module_manifest_source/module_manifest_source.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest_source/module_manifest_source.h"
+#include "src/modular/lib/module_manifest_source/module_manifest_source.h"
namespace modular {
diff --git a/peridot/lib/module_manifest_source/module_manifest_source.h b/src/modular/lib/module_manifest_source/module_manifest_source.h
similarity index 87%
rename from peridot/lib/module_manifest_source/module_manifest_source.h
rename to src/modular/lib/module_manifest_source/module_manifest_source.h
index 1fb9a9a..0d1bc13 100644
--- a/peridot/lib/module_manifest_source/module_manifest_source.h
+++ b/src/modular/lib/module_manifest_source/module_manifest_source.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
+
+#include <fuchsia/modular/cpp/fidl.h>
+#include <lib/async/dispatcher.h>
#include <functional>
#include <string>
#include <vector>
-#include <fuchsia/modular/cpp/fidl.h>
-#include <lib/async/dispatcher.h>
-
namespace modular {
// Abstract base class for all Module Manifest Source implementations.
@@ -43,4 +43,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_MANIFEST_SOURCE_H_
diff --git a/peridot/lib/module_manifest_source/module_package_source.cc b/src/modular/lib/module_manifest_source/module_package_source.cc
similarity index 92%
rename from peridot/lib/module_manifest_source/module_package_source.cc
rename to src/modular/lib/module_manifest_source/module_package_source.cc
index b1728db..dade7aa 100644
--- a/peridot/lib/module_manifest_source/module_package_source.cc
+++ b/src/modular/lib/module_manifest_source/module_package_source.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest_source/module_package_source.h"
+#include "src/modular/lib/module_manifest_source/module_package_source.h"
#include <dirent.h>
-#include <sys/types.h>
-
#include <lib/async/cpp/task.h>
#include <lib/vfs/cpp/service.h>
+#include <sys/types.h>
+
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/memory/weak_ptr.h>
#include <src/lib/fxl/strings/split_string.h>
#include <src/lib/fxl/strings/string_printf.h>
-#include "peridot/lib/module_manifest_source/json.h"
-#include "peridot/lib/module_manifest_source/package_util.h"
#include "src/lib/files/directory.h"
#include "src/lib/files/file.h"
+#include "src/modular/lib/module_manifest_source/json.h"
+#include "src/modular/lib/module_manifest_source/package_util.h"
namespace modular {
diff --git a/peridot/lib/module_manifest_source/module_package_source.h b/src/modular/lib/module_manifest_source/module_package_source.h
similarity index 84%
rename from peridot/lib/module_manifest_source/module_package_source.h
rename to src/modular/lib/module_manifest_source/module_package_source.h
index 37c752d..35f8d5e 100644
--- a/peridot/lib/module_manifest_source/module_package_source.h
+++ b/src/modular/lib/module_manifest_source/module_package_source.h
@@ -2,20 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
+
+#include <fuchsia/maxwell/internal/cpp/fidl.h>
+#include <lib/fidl/cpp/binding_set.h>
+#include <lib/sys/cpp/component_context.h>
#include <functional>
#include <map>
#include <string>
#include <vector>
-#include <fuchsia/maxwell/internal/cpp/fidl.h>
-#include <lib/fidl/cpp/binding_set.h>
-#include <lib/sys/cpp/component_context.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/module_manifest_source/module_manifest_source.h"
+#include "src/modular/lib/module_manifest_source/module_manifest_source.h"
namespace modular {
@@ -49,4 +50,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_MODULE_PACKAGE_SOURCE_H_
diff --git a/peridot/lib/module_manifest_source/package_util.cc b/src/modular/lib/module_manifest_source/package_util.cc
similarity index 89%
rename from peridot/lib/module_manifest_source/package_util.cc
rename to src/modular/lib/module_manifest_source/package_util.cc
index e4c2744..dd8ca88 100644
--- a/peridot/lib/module_manifest_source/package_util.cc
+++ b/src/modular/lib/module_manifest_source/package_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/module_manifest_source/package_util.h"
+#include "src/modular/lib/module_manifest_source/package_util.h"
#include <src/lib/fxl/strings/string_printf.h>
diff --git a/peridot/lib/module_manifest_source/package_util.h b/src/modular/lib/module_manifest_source/package_util.h
similarity index 69%
rename from peridot/lib/module_manifest_source/package_util.h
rename to src/modular/lib/module_manifest_source/package_util.h
index 1aef7ae..337f96c 100644
--- a/peridot/lib/module_manifest_source/package_util.h
+++ b/src/modular/lib/module_manifest_source/package_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
-#define PERIDOT_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
+#ifndef SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
+#define SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
#include <string>
@@ -16,4 +16,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
+#endif // SRC_MODULAR_LIB_MODULE_MANIFEST_SOURCE_PACKAGE_UTIL_H_
diff --git a/peridot/lib/testing/BUILD.gn b/src/modular/lib/testing/BUILD.gn
similarity index 95%
rename from peridot/lib/testing/BUILD.gn
rename to src/modular/lib/testing/BUILD.gn
index 7cf0efe..b0c3fc2 100644
--- a/peridot/lib/testing/BUILD.gn
+++ b/src/modular/lib/testing/BUILD.gn
@@ -35,9 +35,9 @@
public_deps = [
":component_main",
- "//peridot/lib/fidl:single_service_app",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
+ "//src/modular/lib/fidl:single_service_app",
"//src/modular/lib/integration_testing/cpp",
]
}
@@ -111,9 +111,9 @@
]
public_deps = [
- "//peridot/lib/module_manifest:module_facet_reader",
"//sdk/fidl/fuchsia.modular",
"//src/lib/fxl",
+ "//src/modular/lib/module_manifest:module_facet_reader",
]
}
@@ -196,8 +196,8 @@
deps = [
"//peridot/bin/sessionmgr/puppet_master:story_command_executor",
- "//peridot/lib/fidl:clone",
"//sdk/fidl/fuchsia.modular",
+ "//src/modular/lib/fidl:clone",
]
}
@@ -259,14 +259,14 @@
deps = [
"//garnet/public/lib/fsl",
- "//peridot/lib/common:teardown",
- "//peridot/lib/fidl:app_client",
"//peridot/lib/ledger_client:constants",
"//sdk/fidl/fuchsia.ledger",
"//sdk/fidl/fuchsia.sys",
"//sdk/lib/sys/cpp",
"//src/ledger/bin/fidl",
"//src/lib/fxl",
+ "//src/modular/lib/common:teardown",
+ "//src/modular/lib/fidl:app_client",
]
public_deps = [
diff --git a/peridot/lib/testing/README.md b/src/modular/lib/testing/README.md
similarity index 84%
rename from peridot/lib/testing/README.md
rename to src/modular/lib/testing/README.md
index 0110c2f..0eec648 100644
--- a/peridot/lib/testing/README.md
+++ b/src/modular/lib/testing/README.md
@@ -1,6 +1,6 @@
Here is code that helps clients of modular with testing.
-When linked against the `//peridot/lib/testing` library target, a test
+When linked against the `//src/modular/lib/testing` library target, a test
application can use the functions in `lib/testing/testing.h` to interact with
the `TestRunner` service in its environment. This is the standard way to test
multi-process modular applications; these functions allow a test to declare
diff --git a/peridot/lib/testing/component_base.h b/src/modular/lib/testing/component_base.h
similarity index 94%
rename from peridot/lib/testing/component_base.h
rename to src/modular/lib/testing/component_base.h
index c81da84..14c4bc7 100644
--- a/peridot/lib/testing/component_base.h
+++ b/src/modular/lib/testing/component_base.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_COMPONENT_BASE_H_
-#define PERIDOT_LIB_TESTING_COMPONENT_BASE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_COMPONENT_BASE_H_
+#define SRC_MODULAR_LIB_TESTING_COMPONENT_BASE_H_
#include <lib/component/cpp/connect.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/fidl/single_service_app.h"
-#include "peridot/lib/testing/component_main.h"
+#include "src/modular/lib/fidl/single_service_app.h"
+#include "src/modular/lib/testing/component_main.h"
#include "src/modular/public/src/modular/lib/integration_testing/cpp/reporting.h"
#include "src/modular/public/src/modular/lib/integration_testing/cpp/testing.h"
@@ -110,4 +110,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_COMPONENT_BASE_H_
+#endif // SRC_MODULAR_LIB_TESTING_COMPONENT_BASE_H_
diff --git a/peridot/lib/testing/component_context_fake.cc b/src/modular/lib/testing/component_context_fake.cc
similarity index 96%
rename from peridot/lib/testing/component_context_fake.cc
rename to src/modular/lib/testing/component_context_fake.cc
index 8717582..36fad97 100644
--- a/peridot/lib/testing/component_context_fake.cc
+++ b/src/modular/lib/testing/component_context_fake.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/component_context_fake.h"
+#include "src/modular/lib/testing/component_context_fake.h"
#include <src/lib/fxl/logging.h>
diff --git a/peridot/lib/testing/component_context_fake.h b/src/modular/lib/testing/component_context_fake.h
similarity index 91%
rename from peridot/lib/testing/component_context_fake.h
rename to src/modular/lib/testing/component_context_fake.h
index ff40b64..019817c 100644
--- a/peridot/lib/testing/component_context_fake.h
+++ b/src/modular/lib/testing/component_context_fake.h
@@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
-#define PERIDOT_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
-
-#include <string>
+#ifndef SRC_MODULAR_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
+#define SRC_MODULAR_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
#include <lib/fidl/cpp/interface_request.h>
#include <lib/fidl/cpp/string.h>
+
+#include <string>
+
#include <src/lib/fxl/macros.h>
-#include "peridot/lib/testing/entity_resolver_fake.h"
+#include "src/modular/lib/testing/entity_resolver_fake.h"
namespace modular {
@@ -77,4 +78,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
+#endif // SRC_MODULAR_LIB_TESTING_COMPONENT_CONTEXT_FAKE_H_
diff --git a/peridot/lib/testing/component_main.h b/src/modular/lib/testing/component_main.h
similarity index 91%
rename from peridot/lib/testing/component_main.h
rename to src/modular/lib/testing/component_main.h
index decc29e..f83004f 100644
--- a/peridot/lib/testing/component_main.h
+++ b/src/modular/lib/testing/component_main.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_COMPONENT_MAIN_H_
-#define PERIDOT_LIB_TESTING_COMPONENT_MAIN_H_
+#ifndef SRC_MODULAR_LIB_TESTING_COMPONENT_MAIN_H_
+#define SRC_MODULAR_LIB_TESTING_COMPONENT_MAIN_H_
#include <lib/async-loop/cpp/loop.h>
@@ -53,4 +53,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_COMPONENT_MAIN_H_
+#endif // SRC_MODULAR_LIB_TESTING_COMPONENT_MAIN_H_
diff --git a/peridot/lib/testing/entity_resolver_fake.cc b/src/modular/lib/testing/entity_resolver_fake.cc
similarity index 97%
rename from peridot/lib/testing/entity_resolver_fake.cc
rename to src/modular/lib/testing/entity_resolver_fake.cc
index 2870e39..f71a745 100644
--- a/peridot/lib/testing/entity_resolver_fake.cc
+++ b/src/modular/lib/testing/entity_resolver_fake.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/entity_resolver_fake.h"
+#include "src/modular/lib/testing/entity_resolver_fake.h"
#include <lib/fsl/vmo/strings.h>
diff --git a/peridot/lib/testing/entity_resolver_fake.h b/src/modular/lib/testing/entity_resolver_fake.h
similarity index 87%
rename from peridot/lib/testing/entity_resolver_fake.h
rename to src/modular/lib/testing/entity_resolver_fake.h
index 80eaf36..2b66ba9 100644
--- a/peridot/lib/testing/entity_resolver_fake.h
+++ b/src/modular/lib/testing/entity_resolver_fake.h
@@ -2,17 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
-#define PERIDOT_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
-
-#include <map>
-#include <memory>
-#include <string>
+#ifndef SRC_MODULAR_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
+#define SRC_MODULAR_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
#include <lib/fidl/cpp/interface_request.h>
#include <lib/fidl/cpp/string.h>
+
+#include <map>
+#include <memory>
+#include <string>
+
#include <src/lib/fxl/macros.h>
namespace modular {
@@ -42,4 +43,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
+#endif // SRC_MODULAR_LIB_TESTING_ENTITY_RESOLVER_FAKE_H_
diff --git a/peridot/lib/testing/fake_agent_runner_storage.h b/src/modular/lib/testing/fake_agent_runner_storage.h
similarity index 85%
rename from peridot/lib/testing/fake_agent_runner_storage.h
rename to src/modular/lib/testing/fake_agent_runner_storage.h
index ec40b66..8f78268 100644
--- a/peridot/lib/testing/fake_agent_runner_storage.h
+++ b/src/modular/lib/testing/fake_agent_runner_storage.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
-#define PERIDOT_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
+#define SRC_MODULAR_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
#include <functional>
#include <string>
@@ -42,4 +42,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
+#endif // SRC_MODULAR_LIB_TESTING_FAKE_AGENT_RUNNER_STORAGE_H_
diff --git a/peridot/lib/testing/ledger_repository_for_testing.cc b/src/modular/lib/testing/ledger_repository_for_testing.cc
similarity index 92%
rename from peridot/lib/testing/ledger_repository_for_testing.cc
rename to src/modular/lib/testing/ledger_repository_for_testing.cc
index aec4a21..e66a349 100644
--- a/peridot/lib/testing/ledger_repository_for_testing.cc
+++ b/src/modular/lib/testing/ledger_repository_for_testing.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/ledger_repository_for_testing.h"
-
-#include <utility>
+#include "src/modular/lib/testing/ledger_repository_for_testing.h"
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fsl/io/fd.h>
#include <zircon/status.h>
-#include "peridot/lib/common/teardown.h"
-#include "peridot/lib/fidl/app_client.h"
+#include <utility>
+
#include "peridot/lib/ledger_client/constants.h"
+#include "src/modular/lib/common/teardown.h"
+#include "src/modular/lib/fidl/app_client.h"
namespace modular {
diff --git a/peridot/lib/testing/ledger_repository_for_testing.h b/src/modular/lib/testing/ledger_repository_for_testing.h
similarity index 85%
rename from peridot/lib/testing/ledger_repository_for_testing.h
rename to src/modular/lib/testing/ledger_repository_for_testing.h
index 597ede5..32af8f0 100644
--- a/peridot/lib/testing/ledger_repository_for_testing.h
+++ b/src/modular/lib/testing/ledger_repository_for_testing.h
@@ -2,20 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
-#define PERIDOT_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
-
-#include <string>
+#ifndef SRC_MODULAR_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
+#define SRC_MODULAR_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
#include <fuchsia/ledger/cpp/fidl.h>
#include <fuchsia/ledger/internal/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
#include <lib/sys/cpp/component_context.h>
+
+#include <string>
+
#include <src/lib/fxl/macros.h>
#include <src/lib/fxl/memory/weak_ptr.h>
-#include "peridot/lib/fidl/app_client.h"
#include "peridot/lib/scoped_tmpfs/scoped_tmpfs.h"
+#include "src/modular/lib/fidl/app_client.h"
namespace modular {
namespace testing {
@@ -47,4 +48,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
+#endif // SRC_MODULAR_LIB_TESTING_LEDGER_REPOSITORY_FOR_TESTING_H_
diff --git a/peridot/lib/testing/mock_base.cc b/src/modular/lib/testing/mock_base.cc
similarity index 94%
rename from peridot/lib/testing/mock_base.cc
rename to src/modular/lib/testing/mock_base.cc
index ae1d178..307405d 100644
--- a/peridot/lib/testing/mock_base.cc
+++ b/src/modular/lib/testing/mock_base.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/mock_base.h"
+#include "src/modular/lib/testing/mock_base.h"
#include <src/lib/fxl/logging.h>
diff --git a/peridot/lib/testing/mock_base.h b/src/modular/lib/testing/mock_base.h
similarity index 86%
rename from peridot/lib/testing/mock_base.h
rename to src/modular/lib/testing/mock_base.h
index 7adb6fc..9514adb 100644
--- a/peridot/lib/testing/mock_base.h
+++ b/src/modular/lib/testing/mock_base.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_MOCK_BASE_H_
-#define PERIDOT_LIB_TESTING_MOCK_BASE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_MOCK_BASE_H_
+#define SRC_MODULAR_LIB_TESTING_MOCK_BASE_H_
#include <map>
#include <string>
@@ -36,4 +36,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_MOCK_BASE_H_
+#endif // SRC_MODULAR_LIB_TESTING_MOCK_BASE_H_
diff --git a/peridot/lib/testing/module_facet_reader_fake.cc b/src/modular/lib/testing/module_facet_reader_fake.cc
similarity index 91%
rename from peridot/lib/testing/module_facet_reader_fake.cc
rename to src/modular/lib/testing/module_facet_reader_fake.cc
index c181864..3e4ded3f 100644
--- a/peridot/lib/testing/module_facet_reader_fake.cc
+++ b/src/modular/lib/testing/module_facet_reader_fake.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/module_facet_reader_fake.h"
+#include "src/modular/lib/testing/module_facet_reader_fake.h"
#include <src/lib/fxl/logging.h>
diff --git a/peridot/lib/testing/module_facet_reader_fake.h b/src/modular/lib/testing/module_facet_reader_fake.h
similarity index 78%
rename from peridot/lib/testing/module_facet_reader_fake.h
rename to src/modular/lib/testing/module_facet_reader_fake.h
index 5fde30b..e2b4f8c 100644
--- a/peridot/lib/testing/module_facet_reader_fake.h
+++ b/src/modular/lib/testing/module_facet_reader_fake.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
-#define PERIDOT_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
+#define SRC_MODULAR_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
+
+#include <fuchsia/modular/cpp/fidl.h>
#include <functional>
#include <string>
-#include <fuchsia/modular/cpp/fidl.h>
-
-#include "peridot/lib/module_manifest/module_facet_reader.h"
+#include "src/modular/lib/module_manifest/module_facet_reader.h"
namespace modular {
@@ -32,4 +32,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
+#endif // SRC_MODULAR_LIB_TESTING_MODULE_FACET_READER_FAKE_H_
diff --git a/peridot/lib/testing/module_resolver_fake.cc b/src/modular/lib/testing/module_resolver_fake.cc
similarity index 96%
rename from peridot/lib/testing/module_resolver_fake.cc
rename to src/modular/lib/testing/module_resolver_fake.cc
index 2d17d65..cf4bf0c2d 100644
--- a/peridot/lib/testing/module_resolver_fake.cc
+++ b/src/modular/lib/testing/module_resolver_fake.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/module_resolver_fake.h"
+#include "src/modular/lib/testing/module_resolver_fake.h"
namespace modular {
diff --git a/peridot/lib/testing/module_resolver_fake.h b/src/modular/lib/testing/module_resolver_fake.h
similarity index 91%
rename from peridot/lib/testing/module_resolver_fake.h
rename to src/modular/lib/testing/module_resolver_fake.h
index 75831ea..a8dc727 100644
--- a/peridot/lib/testing/module_resolver_fake.h
+++ b/src/modular/lib/testing/module_resolver_fake.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
-#define PERIDOT_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
+#define SRC_MODULAR_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
@@ -47,4 +47,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
+#endif // SRC_MODULAR_LIB_TESTING_MODULE_RESOLVER_FAKE_H_
diff --git a/peridot/lib/testing/session_shell_base.h b/src/modular/lib/testing/session_shell_base.h
similarity index 81%
rename from peridot/lib/testing/session_shell_base.h
rename to src/modular/lib/testing/session_shell_base.h
index 56a2e7a..c02643c 100644
--- a/peridot/lib/testing/session_shell_base.h
+++ b/src/modular/lib/testing/session_shell_base.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_SESSION_SHELL_BASE_H_
-#define PERIDOT_LIB_TESTING_SESSION_SHELL_BASE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_SESSION_SHELL_BASE_H_
+#define SRC_MODULAR_LIB_TESTING_SESSION_SHELL_BASE_H_
-#include "peridot/lib/testing/component_base.h"
-#include "peridot/lib/testing/session_shell_impl.h"
+#include "src/modular/lib/testing/component_base.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
namespace modular {
namespace testing {
@@ -42,4 +42,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_SESSION_SHELL_BASE_H_
+#endif // SRC_MODULAR_LIB_TESTING_SESSION_SHELL_BASE_H_
diff --git a/peridot/lib/testing/session_shell_impl.cc b/src/modular/lib/testing/session_shell_impl.cc
similarity index 95%
rename from peridot/lib/testing/session_shell_impl.cc
rename to src/modular/lib/testing/session_shell_impl.cc
index ad808ed..a3ac5d5 100644
--- a/peridot/lib/testing/session_shell_impl.cc
+++ b/src/modular/lib/testing/session_shell_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/session_shell_impl.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
#include <lib/async/cpp/task.h>
#include <lib/async/default.h>
diff --git a/peridot/lib/testing/session_shell_impl.h b/src/modular/lib/testing/session_shell_impl.h
similarity index 93%
rename from peridot/lib/testing/session_shell_impl.h
rename to src/modular/lib/testing/session_shell_impl.h
index 25b5f5b..745a53f 100644
--- a/peridot/lib/testing/session_shell_impl.h
+++ b/src/modular/lib/testing/session_shell_impl.h
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_SESSION_SHELL_IMPL_H_
-#define PERIDOT_LIB_TESTING_SESSION_SHELL_IMPL_H_
+#ifndef SRC_MODULAR_LIB_TESTING_SESSION_SHELL_IMPL_H_
+#define SRC_MODULAR_LIB_TESTING_SESSION_SHELL_IMPL_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <fuchsia/ui/views/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
#include <lib/sys/cpp/component_context.h>
+
#include <src/lib/fxl/logging.h>
#include <src/lib/fxl/macros.h>
#include <src/lib/fxl/time/time_delta.h>
@@ -71,4 +72,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_SESSION_SHELL_IMPL_H_
+#endif // SRC_MODULAR_LIB_TESTING_SESSION_SHELL_IMPL_H_
diff --git a/peridot/lib/testing/story_controller_mock.h b/src/modular/lib/testing/story_controller_mock.h
similarity index 92%
rename from peridot/lib/testing/story_controller_mock.h
rename to src/modular/lib/testing/story_controller_mock.h
index ebdc6fd6..79846e5 100644
--- a/peridot/lib/testing/story_controller_mock.h
+++ b/src/modular/lib/testing/story_controller_mock.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
-#define PERIDOT_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
-
-#include <string>
+#ifndef SRC_MODULAR_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
+#define SRC_MODULAR_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <fuchsia/ui/views/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
#include <lib/fidl/cpp/interface_ptr_set.h>
+#include <string>
+
namespace modular {
class StoryControllerMock : public fuchsia::modular::StoryController {
@@ -73,4 +73,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
+#endif // SRC_MODULAR_LIB_TESTING_STORY_CONTROLLER_MOCK_H_
diff --git a/peridot/lib/testing/story_provider_mock.h b/src/modular/lib/testing/story_provider_mock.h
similarity index 93%
rename from peridot/lib/testing/story_provider_mock.h
rename to src/modular/lib/testing/story_provider_mock.h
index 845f864..2dee100 100644
--- a/peridot/lib/testing/story_provider_mock.h
+++ b/src/modular/lib/testing/story_provider_mock.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_STORY_PROVIDER_MOCK_H_
-#define PERIDOT_LIB_TESTING_STORY_PROVIDER_MOCK_H_
-
-#include <string>
+#ifndef SRC_MODULAR_LIB_TESTING_STORY_PROVIDER_MOCK_H_
+#define SRC_MODULAR_LIB_TESTING_STORY_PROVIDER_MOCK_H_
#include <fuchsia/modular/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
#include <lib/fidl/cpp/clone.h>
#include <lib/fidl/cpp/interface_ptr_set.h>
-#include "peridot/lib/testing/story_controller_mock.h"
+#include <string>
+
+#include "src/modular/lib/testing/story_controller_mock.h"
namespace modular {
@@ -90,4 +90,4 @@
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_STORY_PROVIDER_MOCK_H_
+#endif // SRC_MODULAR_LIB_TESTING_STORY_PROVIDER_MOCK_H_
diff --git a/peridot/lib/testing/test_driver.h b/src/modular/lib/testing/test_driver.h
similarity index 85%
rename from peridot/lib/testing/test_driver.h
rename to src/modular/lib/testing/test_driver.h
index b805886..3ff5f74 100644
--- a/peridot/lib/testing/test_driver.h
+++ b/src/modular/lib/testing/test_driver.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_TEST_DRIVER_H_
-#define PERIDOT_LIB_TESTING_TEST_DRIVER_H_
+#ifndef SRC_MODULAR_LIB_TESTING_TEST_DRIVER_H_
+#define SRC_MODULAR_LIB_TESTING_TEST_DRIVER_H_
// Header for definitions for Link communication with a test driver module.
namespace modular {
@@ -23,4 +23,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_TEST_DRIVER_H_
+#endif // SRC_MODULAR_LIB_TESTING_TEST_DRIVER_H_
diff --git a/peridot/lib/testing/test_story_command_executor.cc b/src/modular/lib/testing/test_story_command_executor.cc
similarity index 93%
rename from peridot/lib/testing/test_story_command_executor.cc
rename to src/modular/lib/testing/test_story_command_executor.cc
index 9b188b3..a255d18 100644
--- a/peridot/lib/testing/test_story_command_executor.cc
+++ b/src/modular/lib/testing/test_story_command_executor.cc
@@ -1,7 +1,7 @@
// Copyright 2018 The Fuchsia Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/test_story_command_executor.h"
+#include "src/modular/lib/testing/test_story_command_executor.h"
namespace modular {
namespace testing {
diff --git a/peridot/lib/testing/test_story_command_executor.h b/src/modular/lib/testing/test_story_command_executor.h
similarity index 86%
rename from peridot/lib/testing/test_story_command_executor.h
rename to src/modular/lib/testing/test_story_command_executor.h
index 3e628c7..ecda08f 100644
--- a/peridot/lib/testing/test_story_command_executor.h
+++ b/src/modular/lib/testing/test_story_command_executor.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
-#define PERIDOT_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
-
-#include <vector>
+#ifndef SRC_MODULAR_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
+#define SRC_MODULAR_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
#include <fuchsia/modular/cpp/fidl.h>
+#include <vector>
+
#include "peridot/bin/sessionmgr/puppet_master/story_command_executor.h"
namespace modular {
@@ -42,4 +42,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
+#endif // SRC_MODULAR_LIB_TESTING_TEST_STORY_COMMAND_EXECUTOR_H_
diff --git a/peridot/lib/testing/test_with_ledger.cc b/src/modular/lib/testing/test_with_ledger.cc
similarity index 95%
rename from peridot/lib/testing/test_with_ledger.cc
rename to src/modular/lib/testing/test_with_ledger.cc
index 3d37b70..a9de555 100644
--- a/peridot/lib/testing/test_with_ledger.cc
+++ b/src/modular/lib/testing/test_with_ledger.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/test_with_ledger.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
#include <lib/fit/function.h>
diff --git a/peridot/lib/testing/test_with_ledger.h b/src/modular/lib/testing/test_with_ledger.h
similarity index 89%
rename from peridot/lib/testing/test_with_ledger.h
rename to src/modular/lib/testing/test_with_ledger.h
index 426ad7b..bdd5ebd 100644
--- a/peridot/lib/testing/test_with_ledger.h
+++ b/src/modular/lib/testing/test_with_ledger.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_TEST_WITH_LEDGER_H_
-#define PERIDOT_LIB_TESTING_TEST_WITH_LEDGER_H_
-
-#include <memory>
+#ifndef SRC_MODULAR_LIB_TESTING_TEST_WITH_LEDGER_H_
+#define SRC_MODULAR_LIB_TESTING_TEST_WITH_LEDGER_H_
#include <lib/fit/function.h>
#include <lib/gtest/real_loop_fixture.h>
-#include "peridot/lib/testing/ledger_repository_for_testing.h"
+#include <memory>
+
+#include "src/modular/lib/testing/ledger_repository_for_testing.h"
namespace modular {
class LedgerClient;
@@ -59,4 +59,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_TEST_WITH_LEDGER_H_
+#endif // SRC_MODULAR_LIB_TESTING_TEST_WITH_LEDGER_H_
diff --git a/peridot/lib/testing/test_with_session_storage.cc b/src/modular/lib/testing/test_with_session_storage.cc
similarity index 97%
rename from peridot/lib/testing/test_with_session_storage.cc
rename to src/modular/lib/testing/test_with_session_storage.cc
index 98ebb67..4dc331d 100644
--- a/peridot/lib/testing/test_with_session_storage.cc
+++ b/src/modular/lib/testing/test_with_session_storage.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "peridot/lib/testing/test_with_session_storage.h"
+#include "src/modular/lib/testing/test_with_session_storage.h"
namespace modular {
namespace testing {
diff --git a/peridot/lib/testing/test_with_session_storage.h b/src/modular/lib/testing/test_with_session_storage.h
similarity index 86%
rename from peridot/lib/testing/test_with_session_storage.h
rename to src/modular/lib/testing/test_with_session_storage.h
index 6d2ed6f..14ecbf6 100644
--- a/peridot/lib/testing/test_with_session_storage.h
+++ b/src/modular/lib/testing/test_with_session_storage.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
-#define PERIDOT_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
+#define SRC_MODULAR_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
#include <fuchsia/modular/cpp/fidl.h>
#include "peridot/bin/sessionmgr/storage/session_storage.h"
#include "peridot/bin/sessionmgr/storage/story_storage.h"
#include "peridot/lib/ledger_client/page_id.h"
-#include "peridot/lib/testing/test_with_ledger.h"
+#include "src/modular/lib/testing/test_with_ledger.h"
namespace modular {
namespace testing {
@@ -47,4 +47,4 @@
} // namespace testing
} // namespace modular
-#endif // PERIDOT_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
+#endif // SRC_MODULAR_LIB_TESTING_TEST_WITH_SESSION_STORAGE_H_
diff --git a/peridot/lib/testing/wait_until_idle.h b/src/modular/lib/testing/wait_until_idle.h
similarity index 89%
rename from peridot/lib/testing/wait_until_idle.h
rename to src/modular/lib/testing/wait_until_idle.h
index 468c293..8d09256 100644
--- a/peridot/lib/testing/wait_until_idle.h
+++ b/src/modular/lib/testing/wait_until_idle.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PERIDOT_LIB_TESTING_WAIT_UNTIL_IDLE_H_
-#define PERIDOT_LIB_TESTING_WAIT_UNTIL_IDLE_H_
+#ifndef SRC_MODULAR_LIB_TESTING_WAIT_UNTIL_IDLE_H_
+#define SRC_MODULAR_LIB_TESTING_WAIT_UNTIL_IDLE_H_
#include <lib/async-loop/cpp/loop.h>
#include <lib/async/cpp/task.h>
@@ -40,4 +40,4 @@
} // namespace util
-#endif // PERIDOT_LIB_TESTING_WAIT_UNTIL_IDLE_H_
+#endif // SRC_MODULAR_LIB_TESTING_WAIT_UNTIL_IDLE_H_
diff --git a/src/modular/tests/BUILD.gn b/src/modular/tests/BUILD.gn
index c334ffc..5fedc22 100644
--- a/src/modular/tests/BUILD.gn
+++ b/src/modular/tests/BUILD.gn
@@ -45,10 +45,10 @@
]
deps = [
- "//peridot/lib/testing:session_shell_impl",
"//sdk/fidl/fuchsia.modular.testing",
"//sdk/lib/sys/cpp/testing:integration",
"//src/modular/lib/modular_test_harness/cpp:test_harness_fixture",
+ "//src/modular/lib/testing:session_shell_impl",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]
@@ -119,6 +119,7 @@
"//sdk/lib/inspect/testing/cpp",
"//sdk/lib/sys/cpp/testing:integration",
"//sdk/lib/sys/inspect/cpp",
+ "//src/modular/lib/modular_config",
"//src/modular/lib/modular_test_harness/cpp:test_harness_fixture",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
@@ -218,10 +219,10 @@
]
deps = [
- "//peridot/lib/testing:session_shell_impl",
"//sdk/fidl/fuchsia.modular.testing",
"//sdk/lib/sys/cpp/testing:integration",
"//src/modular/lib/modular_test_harness/cpp:test_harness_fixture",
+ "//src/modular/lib/testing:session_shell_impl",
"//third_party/googletest:gtest_main",
"//zircon/public/lib/async-loop-cpp",
]
@@ -289,10 +290,10 @@
"//peridot/bin/agents/clipboard:clipboard_sources",
"//peridot/bin/basemgr:lib",
"//peridot/lib/ledger_client:page_client",
- "//peridot/lib/testing:ledger_repository_for_testing",
"//sdk/fidl/fuchsia.modular.testing",
"//sdk/lib/sys/cpp/testing:integration",
"//src/modular/lib/modular_test_harness/cpp:test_harness_fixture",
+ "//src/modular/lib/testing:ledger_repository_for_testing",
"//third_party/googletest:gtest_main",
]
}
diff --git a/src/modular/tests/clipboard_test.cc b/src/modular/tests/clipboard_test.cc
index 64348ebf..e57961f 100644
--- a/src/modular/tests/clipboard_test.cc
+++ b/src/modular/tests/clipboard_test.cc
@@ -8,8 +8,8 @@
#include "peridot/bin/agents/clipboard/clipboard_impl.h"
#include "peridot/bin/basemgr/noop_clipboard_impl.h"
-#include "peridot/lib/testing/ledger_repository_for_testing.h"
#include "src/modular/lib/modular_test_harness/cpp/test_harness_fixture.h"
+#include "src/modular/lib/testing/ledger_repository_for_testing.h"
namespace {
diff --git a/src/modular/tests/inspect_session_test.cc b/src/modular/tests/inspect_session_test.cc
index b2a8962..b17eb62 100644
--- a/src/modular/tests/inspect_session_test.cc
+++ b/src/modular/tests/inspect_session_test.cc
@@ -10,12 +10,12 @@
#include <lib/inspect/testing/cpp/inspect.h>
#include <zircon/device/vfs.h>
-#include <peridot/lib/modular_config/modular_config_constants.h>
#include <sdk/lib/inspect/testing/cpp/inspect.h>
#include <src/lib/fxl/strings/substitute.h>
#include "gmock/gmock.h"
#include "src/lib/files/glob.h"
+#include "src/modular/lib/modular_config/modular_config_constants.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_session_shell.h"
#include "src/modular/lib/modular_test_harness/cpp/test_harness_fixture.h"
diff --git a/src/modular/tests/last_focus_time_test.cc b/src/modular/tests/last_focus_time_test.cc
index 4c81563..20794bf 100644
--- a/src/modular/tests/last_focus_time_test.cc
+++ b/src/modular/tests/last_focus_time_test.cc
@@ -7,9 +7,9 @@
#include <src/lib/fxl/logging.h>
#include "gmock/gmock.h"
-#include "peridot/lib/testing/session_shell_impl.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_component.h"
#include "src/modular/lib/modular_test_harness/cpp/test_harness_fixture.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
using testing::ElementsAre;
using testing::Gt;
diff --git a/src/modular/tests/session_shell_test.cc b/src/modular/tests/session_shell_test.cc
index 5384227..5f8a64f 100644
--- a/src/modular/tests/session_shell_test.cc
+++ b/src/modular/tests/session_shell_test.cc
@@ -5,7 +5,7 @@
#include <fuchsia/modular/testing/cpp/fidl.h>
#include <lib/fsl/vmo/strings.h>
-#include <peridot/lib/modular_config/modular_config_constants.h>
+#include <src/modular/lib/modular_config/modular_config_constants.h>
#include "gmock/gmock.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_session_shell.h"
diff --git a/src/modular/tests/story_shell_factory_test.cc b/src/modular/tests/story_shell_factory_test.cc
index 8a7e13b..d95d1b1 100644
--- a/src/modular/tests/story_shell_factory_test.cc
+++ b/src/modular/tests/story_shell_factory_test.cc
@@ -8,10 +8,10 @@
#include <src/lib/fxl/logging.h>
-#include "peridot/lib/testing/session_shell_impl.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_component.h"
#include "src/modular/lib/modular_test_harness/cpp/fake_story_shell.h"
#include "src/modular/lib/modular_test_harness/cpp/test_harness_fixture.h"
+#include "src/modular/lib/testing/session_shell_impl.h"
namespace {
