commit 733ba8f0e473b214e55e3b93ded7739c35d85b10
author Tao Bao <tbao@google.com> Fri Nov 20 04:50:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 04:50:31 2015 +0000
tree 2c3b77729bd2f470594a9015a008114463e39e2f
parent 59ab005dde521722129c5264cc52d00963d48609
parent 4ed5735a68090e9eec240693ff6b97ea57576151

Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
am: 4ed5735a68

* commit '4ed5735a68090e9eec240693ff6b97ea57576151':
  releasetools: Fix the bug with TARGET_NO_RECOVERY.

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 872dd4c..2c8bbc6 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