summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-10-03 00:27:54 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-10-03 00:27:54 +0200
commitee516c147ee3d2022771e626f3dd1f9b84064a8e (patch)
tree76c6fa3594480dafbd5b0ef7c032bf7258a017bb /install
parentMerge "otautil: Drop a few unneeded includes." am: 36f72131ff am: 7f9eb2e012 (diff)
parentMerge "otautil: Factor out the utils that're private to recovery." am: c6fb9f9df5 (diff)
downloadandroid_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar.gz
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar.bz2
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar.lz
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar.xz
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.tar.zst
android_bootable_recovery-ee516c147ee3d2022771e626f3dd1f9b84064a8e.zip
Diffstat (limited to 'install')
-rw-r--r--install/Android.bp1
-rw-r--r--install/fuse_install.cpp2
-rw-r--r--install/install.cpp4
-rw-r--r--install/wipe_data.cpp6
4 files changed, 7 insertions, 6 deletions
diff --git a/install/Android.bp b/install/Android.bp
index e24027049..d4606e92c 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -37,6 +37,7 @@ cc_defaults {
],
static_libs: [
+ "librecovery_utils",
"libotautil",
// external dependencies
diff --git a/install/fuse_install.cpp b/install/fuse_install.cpp
index 8a7a278e0..143b5d3fb 100644
--- a/install/fuse_install.cpp
+++ b/install/fuse_install.cpp
@@ -37,7 +37,7 @@
#include "fuse_provider.h"
#include "fuse_sideload.h"
#include "install/install.h"
-#include "otautil/roots.h"
+#include "recovery_utils/roots.h"
static constexpr const char* SDCARD_ROOT = "/sdcard";
// How long (in seconds) we wait for the fuse-provided package file to
diff --git a/install/install.cpp b/install/install.cpp
index 9d67b0105..9166f9cfb 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -51,11 +51,11 @@
#include "install/wipe_data.h"
#include "otautil/error_code.h"
#include "otautil/paths.h"
-#include "otautil/roots.h"
#include "otautil/sysutil.h"
-#include "otautil/thermalutil.h"
#include "private/setup_commands.h"
#include "recovery_ui/ui.h"
+#include "recovery_utils/roots.h"
+#include "recovery_utils/thermalutil.h"
using namespace std::chrono_literals;
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp
index 765a8152b..82660bef0 100644
--- a/install/wipe_data.cpp
+++ b/install/wipe_data.cpp
@@ -28,9 +28,9 @@
#include <android-base/stringprintf.h>
#include "otautil/dirutil.h"
-#include "otautil/logging.h"
-#include "otautil/roots.h"
#include "recovery_ui/ui.h"
+#include "recovery_utils/logging.h"
+#include "recovery_utils/roots.h"
constexpr const char* CACHE_ROOT = "/cache";
constexpr const char* DATA_ROOT = "/data";
@@ -120,4 +120,4 @@ bool WipeData(Device* device, bool convert_fbe) {
}
ui->Print("Data wipe %s.\n", success ? "complete" : "failed");
return success;
-} \ No newline at end of file
+}