[migrate] Re-land of Finish migration to isolated-persistent-storage + AccountManager
flag flip
This is a reland of 9f08f7804d0c1d71e32633a01bb2830335302638
Original change's description:
> [migrate] Finish migration to isolated-persistent-storage + AccountManager flag flip
>
> This migrates all of the remaining components using
> deprecated-global-persistent-storage to isolated-persistent-storage, and
> flips the use_account_manager flag for basemgr to start using
> AccountManager.
>
> SEC-216 #comment
> MF-318 #done
> CF-638 #done
> MF-261 #done
> PKG-490 #done
> CF-649 #done
>
> Change-Id: I2f35a515a590e425cc4d86373c7b8143092a5521
Change-Id: I4c9cc12dab69a927a2e3bf51480aa80bfb19ba0f
diff --git a/build/BUILD.gn b/build/BUILD.gn
index ffa0317..ba9980b 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -21,13 +21,7 @@
"//garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage:has_persistent_storage",
"//garnet/bin/appmgr/integration_tests/util:persistent_storage_test_util",
- "//garnet/bin/auth:account_handler",
- "//garnet/bin/auth:account_manager",
"//garnet/bin/auth:token_manager_factory",
- "//garnet/bin/device_settings:device_settings_manager",
- "//garnet/bin/timezone:timezone",
- "//garnet/go/src/amber:amber",
- "//peridot/bin/basemgr:basemgr",
]
}
diff --git a/garnet/bin/device_settings/BUILD.gn b/garnet/bin/device_settings/BUILD.gn
index 3dd53e1..1a9a82d 100644
--- a/garnet/bin/device_settings/BUILD.gn
+++ b/garnet/bin/device_settings/BUILD.gn
@@ -37,7 +37,6 @@
}
package("device_settings_manager") {
- deprecated_global_persistent_storage = "//build"
deps = [
":bin",
]
diff --git a/garnet/bin/device_settings/meta/device_settings_manager.cmx b/garnet/bin/device_settings/meta/device_settings_manager.cmx
index 484871c..5e3786b 100644
--- a/garnet/bin/device_settings/meta/device_settings_manager.cmx
+++ b/garnet/bin/device_settings/meta/device_settings_manager.cmx
@@ -3,7 +3,7 @@
"binary": "bin/app"
},
"sandbox": {
- "features": [ "deprecated-global-persistent-storage" ],
+ "features": [ "isolated-persistent-storage" ],
"services": [ "fuchsia.logger.LogSink" ]
}
}
diff --git a/garnet/bin/timezone/BUILD.gn b/garnet/bin/timezone/BUILD.gn
index 35c4649..30966b0 100644
--- a/garnet/bin/timezone/BUILD.gn
+++ b/garnet/bin/timezone/BUILD.gn
@@ -37,7 +37,6 @@
}
package("timezone") {
- deprecated_global_persistent_storage = "//build"
deps = [
":bin",
]
diff --git a/garnet/bin/timezone/meta/timezone.cmx b/garnet/bin/timezone/meta/timezone.cmx
index 012a0fd..bc3c05e 100644
--- a/garnet/bin/timezone/meta/timezone.cmx
+++ b/garnet/bin/timezone/meta/timezone.cmx
@@ -3,8 +3,6 @@
"binary": "bin/app"
},
"sandbox": {
- "features": [
- "deprecated-global-persistent-storage"
- ]
+ "features": [ "isolated-persistent-storage" ]
}
}
diff --git a/garnet/go/src/amber/BUILD.gn b/garnet/go/src/amber/BUILD.gn
index 5d8040d..ff252d7 100644
--- a/garnet/go/src/amber/BUILD.gn
+++ b/garnet/go/src/amber/BUILD.gn
@@ -78,8 +78,8 @@
}
package("amber") {
- deprecated_global_persistent_storage = "//build"
deprecated_misc_storage = "//build"
+
extra = [ manifest_file ]
deps = [
diff --git a/garnet/go/src/amber/meta/amber.cmx b/garnet/go/src/amber/meta/amber.cmx
index c01ce70..717e131 100644
--- a/garnet/go/src/amber/meta/amber.cmx
+++ b/garnet/go/src/amber/meta/amber.cmx
@@ -5,7 +5,6 @@
"sandbox": {
"features": [
"config-data",
- "deprecated-global-persistent-storage",
"deprecated-misc-storage",
"shell",
"system-temp"
diff --git a/garnet/go/src/amber/system_updater/meta/system_updater.cmx b/garnet/go/src/amber/system_updater/meta/system_updater.cmx
index 5b64895..4bf1378 100644
--- a/garnet/go/src/amber/system_updater/meta/system_updater.cmx
+++ b/garnet/go/src/amber/system_updater/meta/system_updater.cmx
@@ -6,8 +6,8 @@
"features": [
"build-info",
"shell",
- "deprecated-global-persistent-storage",
- "deprecated-misc-storage"
+ "deprecated-misc-storage",
+ "isolated-persistent-storage"
],
"pkgfs": [
"packages"
diff --git a/peridot/bin/basemgr/BUILD.gn b/peridot/bin/basemgr/BUILD.gn
index d989a44..65fd8db 100644
--- a/peridot/bin/basemgr/BUILD.gn
+++ b/peridot/bin/basemgr/BUILD.gn
@@ -15,7 +15,7 @@
# Whether basemgr and dev_base_shell should use account_manager for account
# creation. This is a temporary flag while modular transitions to use account
# manager.
- use_account_manager = false
+ use_account_manager = true
}
flatbuffer("users") {
@@ -25,7 +25,6 @@
}
executable_package("basemgr") {
- deprecated_global_persistent_storage = "//build"
meta = [
{
path = "meta/basemgr.cmx"
diff --git a/peridot/bin/basemgr/meta/basemgr.cmx b/peridot/bin/basemgr/meta/basemgr.cmx
index 885a0c4..562cbd4 100644
--- a/peridot/bin/basemgr/meta/basemgr.cmx
+++ b/peridot/bin/basemgr/meta/basemgr.cmx
@@ -5,7 +5,7 @@
"sandbox": {
"features": [
"config-data",
- "deprecated-global-persistent-storage"
+ "isolated-persistent-storage"
],
"services": [
"fuchsia.auth.account.AccountManager",
