diff options
| author | Tao Bao <tbao@google.com> | 2018-08-15 11:24:44 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-15 11:24:44 +0200 |
| commit | ddcb99b80149107f95de72b48a824dd9d7d15bf8 (patch) | |
| tree | c6dbc5655e0d1e8551a9f66c7425605769999d26 | |
| parent | Merge "Add fastboot mode to recovery" am: 19a5316412 (diff) | |
| parent | Merge "Track the change to update_engine_sideload path." (diff) | |
| download | android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar.gz android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar.bz2 android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar.lz android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar.xz android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.tar.zst android_bootable_recovery-ddcb99b80149107f95de72b48a824dd9d7d15bf8.zip | |
| -rw-r--r-- | install.cpp | 2 | ||||
| -rw-r--r-- | tests/component/install_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install.cpp b/install.cpp index 800847fdb..e379ef307 100644 --- a/install.cpp +++ b/install.cpp @@ -248,7 +248,7 @@ int SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int } long payload_offset = payload_entry.offset; *cmd = { - "/sbin/update_engine_sideload", + "/system/bin/update_engine_sideload", "--payload=file://" + package, android::base::StringPrintf("--offset=%ld", payload_offset), "--headers=" + std::string(payload_properties.begin(), payload_properties.end()), diff --git a/tests/component/install_test.cpp b/tests/component/install_test.cpp index b9af0b18b..08b429000 100644 --- a/tests/component/install_test.cpp +++ b/tests/component/install_test.cpp @@ -305,7 +305,7 @@ static void VerifyAbUpdateCommands(const std::string& serialno, bool success = t if (success) { ASSERT_EQ(0, SetUpAbUpdateCommands(package, zip, status_fd, &cmd)); 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("--offset=" + std::to_string(payload_entry.offset), cmd[2]); ASSERT_EQ("--headers=" + properties, cmd[3]); |