diff options
author | Doug Zongker <> | 2009-03-24 22:17:05 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 22:17:05 -0700 |
commit | e6faba0580017352bcba4efefac032095d337042 (patch) | |
tree | a857e6ff407fb5e2a2d75c597ab7f1d50d5c567f | |
parent | 97c618f37883e36b798a15b36cae917e7bc1e0c0 (diff) | |
download | bootable_recovery-e6faba0580017352bcba4efefac032095d337042.zip bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.gz bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.bz2 |
Automated import from //branches/master/...@142142,142142
-rw-r--r-- | tools/ota/make-update-script.c | 13 |
1 files changed, 9 insertions, 4 deletions
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. |