commit 84bc4b78cc188e795e94eedc437cf9c5567c6506
author Tao Bao <tbao@google.com> Mon Mar 07 21:49:33 2016 -0800
committer Tao Bao <tbao@google.com> Mon Mar 07 21:49:33 2016 -0800
tree fa90de39e84fc9a83e5af05e0741e7cd4447cbc3
parent 9963b699f3b58043bf6fd5720a4a816eb8219bd2
parent 08a3a32fa937a39c0993446bc368a01e38afe7c5

resolve merge conflicts of 08a3a32fa9 to nyc-dev

Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 6bcf40a..8227e0f 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1423,7 +1423,8 @@
   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())