commit 993d8816da553bb0103612de7a2cd55f5e95ec20
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 23 16:45:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 23 16:45:57 2022 +0000
tree 166a6d6ed4490452970ae5c10468767ec44772dd
parent 5a2ab0ec0db1ea11254459ef36400912455a5ca5
parent 73b61417b6d4a3a27abd712f4277b193e409965f

Merge "Use the right path for compos_verify" am: 8895d4d295 am: 73b61417b6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1994990

Change-Id: I6d95e2b3f7b3fd150f9e7ec4efc19fd0b0679015

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index 5d9a2f6..8cf398e 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -350,7 +350,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) {