summaryrefslogtreecommitdiffstats
path: root/updater/install.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-07-31 01:48:52 +0200
committerTianjie Xu <xunchang@google.com>2019-07-31 02:11:35 +0200
commit60b242cfd58a234727f5d339e2f6fa4e91ffe1fa (patch)
tree2c3f3befcf97039b2670395d18a2f953bc1c70c4 /updater/install.cpp
parentMerge "Create a new function to return the help message for menu" (diff)
downloadandroid_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar.gz
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar.bz2
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar.lz
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar.xz
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.tar.zst
android_bootable_recovery-60b242cfd58a234727f5d339e2f6fa4e91ffe1fa.zip
Diffstat (limited to '')
-rw-r--r--updater/install.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index c82351ec4..be0ceb06c 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -113,7 +113,7 @@ Value* PackageExtractFileFn(const char* name, State* state,
argv.size());
}
const std::string& zip_path = args[0];
- const std::string& dest_path = args[1];
+ std::string dest_path = args[1];
ZipArchiveHandle za = state->updater->GetPackageHandle();
ZipEntry entry;
@@ -122,6 +122,13 @@ Value* PackageExtractFileFn(const char* name, State* state,
return StringValue("");
}
+ // Update the destination of package_extract_file if it's a block device. During simulation the
+ // destination will map to a fake file.
+ if (std::string block_device_name = state->updater->FindBlockDeviceName(dest_path);
+ !block_device_name.empty()) {
+ dest_path = block_device_name;
+ }
+
android::base::unique_fd fd(TEMP_FAILURE_RETRY(
open(dest_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)));
if (fd == -1) {