From bc012de46e99fc936e6c06d19416b8414835c7b6 Mon Sep 17 00:00:00 2001
From: Doug Zongker <>
Date: Tue, 24 Mar 2009 21:30:32 -0700
Subject: Automated import from //branches/donutburger/...@142141,142141

---
 tools/ota/make-update-script.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/ota/make-update-script.c b/tools/ota/make-update-script.c
index 225dc52..1e1148b 100644
--- a/tools/ota/make-update-script.c
+++ b/tools/ota/make-update-script.c
@@ -185,16 +185,21 @@ int main(int argc, char *argv[]) {
     }
 
     // The lines we're looking for look like:
-    //     version-bootloader=x.yy.zzzz
+    //     version-bootloader=x.yy.zzzz|x.yy.zzzz|...
     // or:
-    //     require version-bootloader=x.yy.zzzz
+    //     require version-bootloader=x.yy.zzzz|x.yy.zzzz|...
     char line[256];
     while (fgets(line, sizeof(line), fp)) {
-        const char *name = strtok(line, "="), *value = strtok(NULL, "\n");
+        const char *name = strtok(line, "="), *value = strtok(NULL, "|\n");
         if (value != NULL &&
             (!strcmp(name, "version-bootloader") ||
              !strcmp(name, "require version-bootloader"))) {
-            printf("assert getprop(\"ro.bootloader\") == \"%s\"\n", value);
+            printf("assert getprop(\"ro.bootloader\") == \"%s\"", value);
+
+            while ((value = strtok(NULL, "|\n")) != NULL) {
+              printf(" || getprop(\"ro.bootloader\") == \"%s\"", value);
+            }
+            printf("\n");
         }
         // We also used to check version-baseband, but we update radio.img
         // ourselves, so there's no need.
-- 
cgit v1.1