Merge "Needed here to enable submitting the equivalent fix in AOSP. Generalize keystorekey for non odsign use cases" into stage-aosp-master
diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index e50388e..5d9a2f6 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -381,7 +381,8 @@
const SigningKey& signing_key,
bool* digests_verified) {
if (!directoryHasContent(kCompOsPendingArtifactsDir)) {
- return art::odrefresh::ExitCode::kCompilationRequired;
+ // No pending CompOS artifacts, all that matters is the current ones.
+ return checkArtifacts();
}
// CompOS has generated some artifacts that may, or may not, match the
@@ -532,8 +533,8 @@
if (useCompOs) {
auto compos_key = addCompOsCertToFsVerityKeyring(*key);
if (!compos_key.ok()) {
- odrefresh_status = art::odrefresh::ExitCode::kCompilationRequired;
LOG(WARNING) << compos_key.error();
+ odrefresh_status = checkArtifacts();
} else {
odrefresh_status =
checkCompOsPendingArtifacts(compos_key.value(), *key, &digests_verified);