From 448dccbc7da2b666b2159632173d8896d276c6f3 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 19 Nov 2015 17:05:46 -0800 Subject: [PATCH] releasetools: Fix the bug with TARGET_NO_RECOVERY. The packaging script is broken when we set TARGET_NO_RECOVERY and SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion that "/" must exist in fstab when enabling SYSTEM_ROOT_IMAGE. Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1 (cherry picked from commit 48550cceb0bc4a7a0ec05aa87f8b5872b9ac7246) --- tools/releasetools/common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 31aeca722..ca9952d1e 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -210,8 +210,11 @@ def LoadInfoDict(input_file, input_dir=None): 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 -- 2.11.0