diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-06-26 14:44:37 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-06-26 14:46:58 -0700 |
| commit | cd61e39a22c73479f89a37d5814d40f523cfd279 (patch) | |
| tree | 86095bd5338a9eb6a80fda51434b93a730429d7f /init/builtins.cpp | |
| parent | 7cd1285ea12fbb3edb08d7630a97be729fdd49bf (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.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index f188ef9106..fca98095e8 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) { |