diff options
| author | Ben Henry <benhenry@google.com> | 2016-02-03 00:34:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-03 00:34:11 +0000 |
| commit | e092a037e671d57bd1d0287d0b1f2e91381e7a58 (patch) | |
| tree | a0999367125b41c4dd771925e2492502a1e90bd5 | |
| parent | 6c07f890548716f6963271421bb6afe8a7befcf8 (diff) | |
| parent | d5f1d1c010a450c18c740951fc84482991e09bd7 (diff) | |
| download | platform_build-brillo-m7-mr-dev.tar.gz platform_build-brillo-m7-mr-dev.tar.bz2 platform_build-brillo-m7-mr-dev.zip | |
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." into brillo-m7-mr-devbrillo-m7-mr-dev
| -rw-r--r-- | tools/releasetools/common.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 0063d6387e..545a31c437 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -211,8 +211,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 |