Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97de9c3d authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Track the change to update_engine_sideload path."

parents 19a53164 2cc9bbb1

install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()),

tests/component/install_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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]);