commit 73b61417b6d4a3a27abd712f4277b193e409965f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 23 16:31:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 23 16:31:42 2022 +0000
tree 166a6d6ed4490452970ae5c10468767ec44772dd
parent d164f6f9dff92b569b797dcc66f3653b09d0634d
parent 8895d4d295c0fe2490bbf8653ccb03bbd8051406

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

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

Change-Id: I1f1926a9a5979a52ef8467bd5b1df39894d077ce

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) {