From 17054c051a846743ecbfacec5986fe8b35152c9d Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 3 May 2018 22:41:23 -0700 Subject: otautil: Rename dir/sys/thermal utils. Test: mmma -j bootable/recovery Change-Id: I32ab98549e91f993364306e4a88dc654221b3869 --- recovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recovery.cpp') diff --git a/recovery.cpp b/recovery.cpp index 890f99c53..d8f56b83e 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -67,7 +67,7 @@ #include "fuse_sideload.h" #include "install.h" #include "minui/minui.h" -#include "otautil/DirUtil.h" +#include "otautil/dirutil.h" #include "otautil/error_code.h" #include "otautil/paths.h" #include "roots.h" -- cgit v1.2.3 From 2c52639d01cb2ff9f0a805e0dda72d39a5487d88 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 3 May 2018 23:01:13 -0700 Subject: Move reboot() from common.h into otautil/sysutil.h. This breaks the dependency on common.h (which belongs to recovery/librecovery) from librecovery_ui. reboot() is now owned by libotautil, which is expected to be a leaf node to be depended on. With the change, recovery and updater also share the same reboot() code now. Test: mmma -j bootable/recovery Change-Id: I1cc5d702cfe49302048db33d31c9c87ddc97ac71 --- recovery.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'recovery.cpp') diff --git a/recovery.cpp b/recovery.cpp index d8f56b83e..7219771cb 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -70,6 +70,7 @@ #include "otautil/dirutil.h" #include "otautil/error_code.h" #include "otautil/paths.h" +#include "otautil/sysutil.h" #include "roots.h" #include "rotate_logs.h" #include "screen_ui.h" @@ -177,14 +178,6 @@ bool is_ro_debuggable() { return android::base::GetBoolProperty("ro.debuggable", false); } -bool reboot(const std::string& command) { - std::string cmd = command; - if (android::base::GetBoolProperty("ro.boot.quiescent", false)) { - cmd += ",quiescent"; - } - return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd); -} - // command line args come from, in decreasing precedence: // - the actual command line // - the bootloader control block (one per line, after "recovery") -- cgit v1.2.3