Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4 am: 4b7ed5a71b
am: 50a4171030
Change-Id: If392f57e2c2e11294e6589c00a535c49a35bb534
diff --git a/update_verifier/update_verifier_main.cpp b/update_verifier/update_verifier_main.cpp
index 9dd5a0c..a86203b 100644
--- a/update_verifier/update_verifier_main.cpp
+++ b/update_verifier/update_verifier_main.cpp
@@ -16,11 +16,20 @@
// See the comments in update_verifier.cpp.
+#include <string>
+
#include <android-base/logging.h>
+#include <android-base/properties.h>
#include "update_verifier/update_verifier.h"
int main(int argc, char** argv) {
+ std::string s = android::base::GetProperty("ro.boot.slot_suffix", "");
+
+ if (s.empty()) {
+ return 0; // non-A/B update device, so we quit
+ }
+
// Set up update_verifier logging to be written to kmsg; because we may not have Logd during
// boot time.
android::base::InitLogging(argv, &android::base::KernelLogger);