OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7166e3a
)
make bootloader requirements optional
author
Doug Zongker
<dougz@android.com>
Wed, 22 Jul 2009 16:28:25 +0000
(09:28 -0700)
committer
Doug Zongker
<dougz@android.com>
Wed, 22 Jul 2009 16:28:25 +0000
(09:28 -0700)
Interpret a "*" in the "require version-bootloader" line as "don't
require any specific bootloader". Sholes OTAs include the bootloader
and the main system in the same package.
tools/releasetools/ota_from_target_files
patch
|
blob
|
history
diff --git
a/tools/releasetools/ota_from_target_files
b/tools/releasetools/ota_from_target_files
index
f2404b3
..
b3f0b37
100755
(executable)
--- a/
tools/releasetools/ota_from_target_files
+++ b/
tools/releasetools/ota_from_target_files
@@
-291,7
+291,8
@@
def AppendAssertions(script, input_zip):
m = re.search(r"require\s+version-bootloader\s*=\s*(\S+)", info)
if m:
bootloaders = m.group(1).split("|")
- script.AssertSomeBootloader(*bootloaders)
+ if "*" not in bootloaders:
+ script.AssertSomeBootloader(*bootloaders)
def WriteFullOTAPackage(input_zip, output_zip):