[components] Don't use bare package URLs.
CF-473 #done
CF-409 #done
CF-347 #done
CF-302 #done
TESTED: CQ, manual testing of all shells
Change-Id: I3c507c781a0d72999601eab637d927b9441407de
diff --git a/bin/acquirers/story_info/BUILD.gn b/bin/acquirers/story_info/BUILD.gn
index c25f5c6..2b7b203 100644
--- a/bin/acquirers/story_info/BUILD.gn
+++ b/bin/acquirers/story_info/BUILD.gn
@@ -6,8 +6,6 @@
import("//peridot/build/executable_package.gni")
executable_package("story_info") {
- deprecated_bare_package_url = "//build"
-
meta = [
{
path = "meta/story_info.cmx"
diff --git a/bin/basemgr/BUILD.gn b/bin/basemgr/BUILD.gn
index eee1163..595755d 100644
--- a/bin/basemgr/BUILD.gn
+++ b/bin/basemgr/BUILD.gn
@@ -19,8 +19,6 @@
}
executable_package("basemgr") {
- deprecated_bare_package_url = "//build"
-
meta = [
{
path = "meta/basemgr.cmx"
diff --git a/bin/basemgr/basemgr_settings.cc b/bin/basemgr/basemgr_settings.cc
index 23a1612..87472e4 100644
--- a/bin/basemgr/basemgr_settings.cc
+++ b/bin/basemgr/basemgr_settings.cc
@@ -18,14 +18,18 @@
"base_shell",
"fuchsia-pkg://fuchsia.com/userpicker_base_shell#meta/"
"userpicker_base_shell.cmx");
- story_shell.url =
- command_line.GetOptionValueWithDefault("story_shell", "mondrian");
+ story_shell.url = command_line.GetOptionValueWithDefault(
+ "story_shell", "fuchsia-pkg://fuchsia.com/mondrian#meta/mondrian.cmx");
sessionmgr.url = command_line.GetOptionValueWithDefault(
"sessionmgr", "fuchsia-pkg://fuchsia.com/sessionmgr#meta/sessionmgr.cmx");
session_shell.url = command_line.GetOptionValueWithDefault(
- "session_shell", "ermine_session_shell");
+ "session_shell",
+ "fuchsia-pkg://fuchsia.com/ermine_session_shell#meta/"
+ "ermine_session_shell.cmx");
account_provider.url = command_line.GetOptionValueWithDefault(
- "account_provider", "token_manager_factory");
+ "account_provider",
+ "fuchsia-pkg://fuchsia.com/token_manager_factory#meta/"
+ "token_manager_factory.cmx");
disable_statistics = command_line.HasOption("disable_statistics");
no_minfs = command_line.HasOption("no_minfs");
diff --git a/bin/basemgr/user_provider_impl.cc b/bin/basemgr/user_provider_impl.cc
index 8520afb..af311fd 100644
--- a/bin/basemgr/user_provider_impl.cc
+++ b/bin/basemgr/user_provider_impl.cc
@@ -28,11 +28,15 @@
// Dev auth provider configuration
constexpr char kDevAuthProviderType[] = "dev";
-constexpr char kDevAuthProviderUrl[] = "dev_auth_provider";
+constexpr char kDevAuthProviderUrl[] =
+ "fuchsia-pkg://fuchsia.com/dev_auth_provider#meta/"
+ "dev_auth_provider.cmx";
// Google auth provider configuration
constexpr char kGoogleAuthProviderType[] = "google";
-constexpr char kGoogleAuthProviderUrl[] = "google_auth_provider";
+constexpr char kGoogleAuthProviderUrl[] =
+ "fuchsia-pkg://fuchsia.com/google_auth_provider#meta/"
+ "google_auth_provider.cmx";
fuchsia::modular::auth::AccountPtr Convert(
const fuchsia::modular::UserStorage* const user) {
diff --git a/bin/module_resolver/BUILD.gn b/bin/module_resolver/BUILD.gn
index 3c7d24a..09f661f 100644
--- a/bin/module_resolver/BUILD.gn
+++ b/bin/module_resolver/BUILD.gn
@@ -7,8 +7,6 @@
import("//peridot/build/tests_package.gni")
executable_package("module_resolver") {
- deprecated_bare_package_url = "//build"
-
meta = [
{
path = "meta/module_resolver.cmx"
diff --git a/bin/sessionmgr/story_runner/BUILD.gn b/bin/sessionmgr/story_runner/BUILD.gn
index 408454a..bb689ee 100644
--- a/bin/sessionmgr/story_runner/BUILD.gn
+++ b/bin/sessionmgr/story_runner/BUILD.gn
@@ -92,8 +92,6 @@
}
executable_package("dev_story_shell") {
- deprecated_bare_package_url = "//build"
-
meta = [
{
path = "meta/dev_story_shell.cmx"
diff --git a/tests/modular_tests.json b/tests/modular_tests.json
index fa592ec..af69f88 100644
--- a/tests/modular_tests.json
+++ b/tests/modular_tests.json
@@ -30,7 +30,7 @@
{
"name": "embed_shell",
"exec": [
- "basemgr",
+ "fuchsia-pkg://fuchsia.com/basemgr#meta/basemgr.cmx",
"--test",
"--account_provider=fuchsia-pkg://fuchsia.com/dev_token_manager#meta/dev_token_manager.cmx",
"--base_shell=fuchsia-pkg://fuchsia.com/dev_base_shell#meta/dev_base_shell.cmx",
