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

resolve merge conflicts of 08a3a32fa9 to nyc-dev 

Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd
This commit is contained in:
Tao Bao 2016-03-07 21:49:33 -08:00
parent 9963b699f3 08a3a32fa9
commit 84bc4b78cc
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

@ -1423,7 +1423,8 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
if oem_props is not None and len(oem_props) > 0:
if OPTIONS.oem_source is None:
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(
open(OPTIONS.oem_source).readlines())