commit 956e119b13d176ffd56c0232de87e9e76ed5dbfc
author Tao Bao <tbao@google.com> Fri Nov 20 04:56:46 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 04:56:46 2015 +0000
tree becfef83e15769f6e9d51ee0f75c9ecd09473e97
parent ed97097f9d3cca28e3203e9349c1439854632616
parent 842e858f0c235ff7a95091e1d7963ab0947d5573

Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am: 4ed5735a68 am: 733ba8f0e4
am: 842e858f0c

* commit '842e858f0c235ff7a95091e1d7963ab0947d5573':
  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