summaryrefslogtreecommitdiffstats
path: root/install.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-04-26 03:59:40 +0200
committerTao Bao <tbao@google.com>2018-04-26 06:46:00 +0200
commit641fa97def3e6ef52471e47ad25d0658ef4d943e (patch)
treef26b3a858f289f5806b92daf0e776c082a246b8a /install.cpp
parentMerge "updater_sample: Use stubs libs for android.test.base / runner." (diff)
downloadandroid_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar.gz
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar.bz2
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar.lz
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar.xz
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.tar.zst
android_bootable_recovery-641fa97def3e6ef52471e47ad25d0658ef4d943e.zip
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/install.cpp b/install.cpp
index d05893171..30fd2c6be 100644
--- a/install.cpp
+++ b/install.cpp
@@ -52,6 +52,7 @@
#include "otautil/SysUtil.h"
#include "otautil/ThermalUtil.h"
#include "otautil/error_code.h"
+#include "otautil/paths.h"
#include "private/install.h"
#include "roots.h"
#include "ui.h"
@@ -627,10 +628,8 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
return result;
}
-int install_package(const std::string& path, bool* wipe_cache, const std::string& install_file,
- bool needs_mount, int retry_count) {
+int install_package(const std::string& path, bool* wipe_cache, bool needs_mount, int retry_count) {
CHECK(!path.empty());
- CHECK(!install_file.empty());
CHECK(wipe_cache != nullptr);
modified_flash = true;
@@ -693,6 +692,7 @@ int install_package(const std::string& path, bool* wipe_cache, const std::string
std::string log_content =
android::base::Join(log_header, "\n") + "\n" + android::base::Join(log_buffer, "\n") + "\n";
+ const std::string& install_file = Paths::Get().temporary_install_file();
if (!android::base::WriteStringToFile(log_content, install_file)) {
PLOG(ERROR) << "failed to write " << install_file;
}