commit 07c78fe446e39f1cbc50119f1bbedda05d47411e
author Tao Bao <tbao@google.com> Tue Aug 14 22:25:44 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 14 22:25:44 2018 -0700
tree c6dbc5655e0d1e8551a9f66c7425605769999d26
parent b0851cf8c424477c7514acb86a5dc48b57a01157
parent 97de9c3d3eaf3974ce919705090c73514124c9d8

Merge "Track the change to update_engine_sideload path."
am: 97de9c3d3e

Change-Id: I7b16e7b90ad473581216dda7f991245d7a71525d

install.cpp

diff --git a/install.cpp b/install.cpp
index 800847f..e379ef3 100644
--- a/install.cpp
+++ b/install.cpp
@@ -248,7 +248,7 @@
   }
   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()),

tests/component/install_test.cpp

diff --git a/tests/component/install_test.cpp b/tests/component/install_test.cpp
index b9af0b1..08b4290 100644
--- a/tests/component/install_test.cpp
+++ b/tests/component/install_test.cpp
@@ -305,7 +305,7 @@
   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]);