commit 4e677900f7b0017fcd926dc66d778e355e6a1bae
author Tao Bao <tbao@google.com> Fri Mar 04 19:20:15 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 19:20:15 2016 +0000
tree b54f77955172cfd11e08323bbdf0447beefa5c86
parent d3c08f8b763c1d8f865896cf7d03d1794bdd14fe
parent 1bb5a189185fec005a48ed59ded853f398b091ce

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

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 f51920a..8923a05 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1424,7 +1424,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())