summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <>2009-03-25 06:17:05 +0100
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-25 06:17:05 +0100
commite6faba0580017352bcba4efefac032095d337042 (patch)
treea857e6ff407fb5e2a2d75c597ab7f1d50d5c567f
parentAutomated import from //branches/master/...@140824,140824 (diff)
downloadandroid_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.gz
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.bz2
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.lz
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.xz
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.tar.zst
android_bootable_recovery-e6faba0580017352bcba4efefac032095d337042.zip
Diffstat (limited to '')
-rw-r--r--tools/ota/make-update-script.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/ota/make-update-script.c b/tools/ota/make-update-script.c
index 225dc526a..1e1148bba 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.