p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 55766e47: Merge change 5150 into donut 

Merge commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94'

* commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94':
  don't fail if no required bootloaders are defined
This commit is contained in:
Android (Google) Code Review 2009-06-23 16:34:08 -07:00 committed by The Android Open Source Project
parent 4179f16e48 55766e47aa
commit 0fbd7da3cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/ota_from_target_files
View File

@ -418,7 +418,7 @@ def GetBuildProp(property, z):
return bp
m = re.search(re.escape(property) + r"=(.*)\n", bp)
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()
@ -476,7 +476,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
if sf is None or fn in OPTIONS.require_verbatim:
# This file should be included 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"
tf.AddToZip(output_zip)
verbatim_targets.append((fn, tf.size))