commit e9e9b709d97b9d6696b85c6a7e8f1d5976cb9b74
author Martijn Coenen <maco@google.com> Tue Mar 23 17:30:46 2021 +0100
committer Martijn Coenen <maco@google.com> Tue Mar 23 17:33:19 2021 +0100
tree 2ff976d9f0e7347136cfa3fd114f0030e099e9ed
parent 0f6cea75e4a93a204748f856cd0943b1a89447a0

Bail early on devices without updatable APEX.

Change-Id: Ie7e87941f454644287cfe25612d848e0d5174c41

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index 33d04ca..df27815 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -303,6 +303,11 @@
     };
     auto scope_guard = android::base::make_scope_guard(errorScopeGuard);
 
+    if (!android::base::GetBoolProperty("ro.apex.updatable", false)) {
+        LOG(INFO) << "Device doesn't support updatable APEX, exiting.";
+        return 0;
+    }
+
     SigningKey* key;
     if (kUseKeystore) {
         auto keystoreResult = KeystoreKey::getInstance();