openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fix one missing case for --oem_no_mount." 

am: 4e677900f7

* commit '4e677900f7b0017fcd926dc66d778e355e6a1bae':
  releasetools: Fix one missing case for --oem_no_mount.
This commit is contained in:
Tao Bao 2016-03-04 19:30:01 +00:00 committed by android-build-merger
parent be81620114 4e677900f7
commit aa82bd62cb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/ota_from_target_files.py
View File

@ -1424,7 +1424,8 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
if oem_props is not None and len(oem_props) > 0: if oem_props is not None and len(oem_props) > 0:
if OPTIONS.oem_source is None: if OPTIONS.oem_source is None:
raise common.ExternalError("OEM source required for this build") raise common.ExternalError("OEM source required for this build")
script.Mount("/oem", recovery_mount_options) if not OPTIONS.oem_no_mount:
script.Mount("/oem", recovery_mount_options)
oem_dict = common.LoadDictionaryFromLines( oem_dict = common.LoadDictionaryFromLines(
open(OPTIONS.oem_source).readlines()) open(OPTIONS.oem_source).readlines())