PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track the change to update_engine_sideload path."

Browse Source
This commit is contained in:
Tao Bao
2018-08-15 01:46:31 +00:00
committed by Gerrit Code Review
parent 19a5316412 2cc9bbb1ec
commit 97de9c3d3e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.cpp
+1 -1
View File
@@ -248,7 +248,7 @@ int SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
} }
long payload_offset = payload_entry.offset; long payload_offset = payload_entry.offset;
*cmd = { *cmd = {
"/sbin/update_engine_sideload", "/system/bin/update_engine_sideload",
"--payload=file://" + package, "--payload=file://" + package,
android::base::StringPrintf("--offset=%ld", payload_offset), android::base::StringPrintf("--offset=%ld", payload_offset),
"--headers=" + std::string(payload_properties.begin(), payload_properties.end()), "--headers=" + std::string(payload_properties.begin(), payload_properties.end()),
tests/component/install_test.cpp
+1 -1
View File
@@ -305,7 +305,7 @@ static void VerifyAbUpdateCommands(const std::string& serialno, bool success = t
if (success) { if (success) {
ASSERT_EQ(0, SetUpAbUpdateCommands(package, zip, status_fd, &cmd)); ASSERT_EQ(0, SetUpAbUpdateCommands(package, zip, status_fd, &cmd));
ASSERT_EQ(5U, cmd.size()); ASSERT_EQ(5U, cmd.size());
ASSERT_EQ("/sbin/update_engine_sideload", cmd[0]); ASSERT_EQ("/system/bin/update_engine_sideload", cmd[0]);
ASSERT_EQ("--payload=file://" + package, cmd[1]); ASSERT_EQ("--payload=file://" + package, cmd[1]);
ASSERT_EQ("--offset=" + std::to_string(payload_entry.offset), cmd[2]); ASSERT_EQ("--offset=" + std::to_string(payload_entry.offset), cmd[2]);
ASSERT_EQ("--headers=" + properties, cmd[3]); ASSERT_EQ("--headers=" + properties, cmd[3]);