StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5150 into donut

Browse Source 
* changes:
  don't fail if no required bootloaders are defined
This commit is contained in:
Android (Google) Code Review
2009-06-23 16:32:18 -07:00
parent bf8a59aa12 9fc74c7823
commit 55766e47aa
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/ota_from_target_files
View File

@@ -288,11 +288,9 @@ def AppendAssertions(script, input_zip):
info = input_zip.read("OTA/android-info.txt") info = input_zip.read("OTA/android-info.txt")
m = re.search(r"require\s+version-bootloader\s*=\s*(\S+)", info) m = re.search(r"require\s+version-bootloader\s*=\s*(\S+)", info)
if not m: if m:
raise ExternalError("failed to find required bootloaders in " bootloaders = m.group(1).split("|")
"android-info.txt") script.AssertSomeBootloader(*bootloaders)
bootloaders = m.group(1).split("|")
script.AssertSomeBootloader(*bootloaders)
def WriteFullOTAPackage(input_zip, output_zip): def WriteFullOTAPackage(input_zip, output_zip):
@@ -415,7 +413,7 @@ def GetBuildProp(property, z):
return bp return bp
m = re.search(re.escape(property) + r"=(.*)\n", bp) m = re.search(re.escape(property) + r"=(.*)\n", bp)
if not m: if not m:
raise ExternalException("couldn't find %s in build.prop" % (property,)) raise common.ExternalError("couldn't find %s in build.prop" % (property,))
return m.group(1).strip() return m.group(1).strip()
@@ -467,7 +465,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
if sf is None or fn in OPTIONS.require_verbatim: if sf is None or fn in OPTIONS.require_verbatim:
# This file should be included verbatim # This file should be included verbatim
if fn in OPTIONS.prohibit_verbatim: if fn in OPTIONS.prohibit_verbatim:
raise ExternalError("\"%s\" must be sent verbatim" % (fn,)) raise common.ExternalError("\"%s\" must be sent verbatim" % (fn,))
print "send", fn, "verbatim" print "send", fn, "verbatim"
tf.AddToZip(output_zip) tf.AddToZip(output_zip)
verbatim_targets.append((fn, tf.size)) verbatim_targets.append((fn, tf.size))