From 1bb5a189185fec005a48ed59ded853f398b091ce Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 4 Mar 2016 09:45:03 -0800 Subject: [PATCH] releasetools: Fix one missing case for --oem_no_mount. The CL in [1] added support for --oem_no_mount. It missed one place that guards the OEM mounting. [1] commit 8608cde944d64dece63e8c770deb78c1d092c719 Change-Id: I6ecaa94cd0866e0fd4fc88cb0aa3ebf55cde2968 --- tools/releasetools/ota_from_target_files.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index f51920a152..8923a0532c 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1424,7 +1424,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())