commit e092a037e671d57bd1d0287d0b1f2e91381e7a58
author Ben Henry <benhenry@google.com> Wed Feb 03 00:34:11 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 00:34:11 2016 +0000
tree a0999367125b41c4dd771925e2492502a1e90bd5
parent 6c07f890548716f6963271421bb6afe8a7befcf8
parent d5f1d1c010a450c18c740951fc84482991e09bd7

Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." into brillo-m7-mr-dev

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 0063d63..545a31c 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -211,8 +211,11 @@
   makeint("boot_size")
   makeint("fstab_version")
 
-  d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],
-                                 d.get("system_root_image", False))
+  if d.get("no_recovery", False) == "true":
+    d["fstab"] = None
+  else:
+    d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],
+                                   d.get("system_root_image", False))
   d["build.prop"] = LoadBuildProp(read_helper)
   return d