summaryrefslogtreecommitdiff
path: root/init/builtins.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2019-06-26 14:44:37 -0700
committerTom Cherry <tomcherry@google.com>2019-06-26 14:46:58 -0700
commit172c83f972cd2e2603fc12efc21a0b0b69b18b8e (patch)
tree86095bd5338a9eb6a80fda51434b93a730429d7f /init/builtins.cpp
parentff88e3012671dbd36d1bfae07b168ea1c86ab07f (diff)
init: remove last init.cpp global
By moving it into builtins.cpp..., but that's less bad than it is now, especially since this is defunct in code targeting Q+. Remove the guards that init.h isn't being included by other files too as it's not useful anymore. Test: build Change-Id: Ic564fcff9e8716ec924098b07a8c9d94ca25f960
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r--init/builtins.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index f188ef910..fca98095e 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -89,6 +89,8 @@ using android::fs_mgr::ReadFstabFromFile;
namespace android {
namespace init {
+std::vector<std::string> late_import_paths;
+
static constexpr std::chrono::nanoseconds kCommandRetryTimeout = 5s;
static Result<void> reboot_into_recovery(const std::vector<std::string>& options) {