commit a61218c13637bc7194750443ae99e32602d2879a
author Alan Stokes <alanstokes@google.com> Tue Feb 22 16:38:56 2022 +0000
committer Alan Stokes <alanstokes@google.com> Tue Feb 22 16:41:05 2022 +0000
tree 181a15d0d9c4f5d67bb5c493999af81d6ddf6322
parent ca744a7442910b2e3def05d27170cc5da29028c4

Use the right path for compos_verify

Otherwise odsign's attempt to run it fails:
odsign  : /apex/com.android.compos/bin/compos_verify_key returned 255

Bug: 218494522
Test: composd_cmd staged-apex-compile, reboot
Change-Id: Ifb8060194b63cd26cbfc46aa8ff6ae49ed0c61af

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index dadcf08..c41fae5 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -338,7 +338,7 @@
 }
 
 Result<OdsignInfo> getComposInfo(const std::vector<uint8_t>& /*compos_key*/) {
-    const char* const argv[] = {kCompOsVerifyPath, "--instance", "current"};
+    const char* const argv[] = {kNewCompOsVerifyPath, "--instance", "current"};
     int result =
         logwrap_fork_execvp(arraysize(argv), argv, nullptr, false, LOG_ALOG, false, nullptr);
     if (result != 0) {