From 2cc9bbb1ec55b9e0b84c667e0657cc12a83c49d8 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 14 Aug 2018 12:34:46 -0700 Subject: Track the change to update_engine_sideload path. Bug: 112494634 Test: Build and boot into recovery image on taimen. Verify that `Apply updates from ADB` keeps working. Test: Run recovery_component_test on marlin. Change-Id: I9ee8834053fda79a4fd77bfa83eab3cc51a90dff --- install.cpp | 2 +- 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]); -- cgit v1.2.3