summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-01 22:37:21 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-01 22:37:21 +0100
commit2f9b98c99f2363714f3e2684d3279d387992f00e (patch)
tree0c75340e320034812743b58e9a3edbd09768bded /updater
parentDO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours am: 9ab6af5a61 -s ours (diff)
parentMerge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 (diff)
downloadandroid_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar.gz
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar.bz2
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar.lz
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar.xz
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.tar.zst
android_bootable_recovery-2f9b98c99f2363714f3e2684d3279d387992f00e.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/install.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index a41c5db3c..5f3f675b1 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -1061,15 +1061,13 @@ Value* ApplyPatchFn(const char* name, State* state, int argc, Expr* argv[]) {
}
std::vector<std::string> patch_sha_str;
- std::vector<Value*> patch_ptrs;
for (int i = 0; i < patchcount; ++i) {
patch_sha_str.push_back(patch_shas[i]->data);
- patch_ptrs.push_back(patches[i].get());
}
int result = applypatch(source_filename, target_filename,
target_sha1, target_size,
- patch_sha_str, patch_ptrs.data(), NULL);
+ patch_sha_str, patches, NULL);
return StringValue(result == 0 ? "t" : "");
}