From: Tao Bao <tbao@google.com>
Date: Mon, 27 Feb 2017 23:12:05 +0000 (-0800)
Subject: Remove the backwards compatibility support for misc_info.txt.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6cd54739a443c62212b176fe94414217b532b8b8;p=android-x86%2Fbuild.git

Remove the backwards compatibility support for misc_info.txt.

We introduced META/misc_info.txt to hold the misc info since Gingerbread
(commit 37974731fcb4e32b1de5f213d34bd832ca889869). Remove the backwards
compatibility support for building pre-G TF zips.

Test: `m dist` works.
Change-Id: Ibff7aaf69cc7e460634c049d11a004f7196f8f73
---

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 027e9f5ee..5a24d5ed5 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -146,30 +146,13 @@ def LoadInfoDict(input_file, input_dir=None):
       except IOError as e:
         if e.errno == errno.ENOENT:
           raise KeyError(fn)
-  d = {}
+
   try:
     d = LoadDictionaryFromLines(read_helper("META/misc_info.txt").split("\n"))
   except KeyError:
-    # ok if misc_info.txt doesn't exist
-    pass
-
-  # backwards compatibility: These values used to be in their own
-  # files.  Look for them, in case we're processing an old
-  # target_files zip.
+    raise ValueError("can't find META/misc_info.txt in input target-files")
 
-  if "recovery_api_version" not in d:
-    try:
-      d["recovery_api_version"] = read_helper(
-          "META/recovery-api-version.txt").strip()
-    except KeyError:
-      raise ValueError("can't find recovery API version in input target-files")
-
-  if "tool_extensions" not in d:
-    try:
-      d["tool_extensions"] = read_helper("META/tool-extensions.txt").strip()
-    except KeyError:
-      # ok if extensions don't exist
-      pass
+  assert "recovery_api_version" in d
 
   if "fstab_version" not in d:
     d["fstab_version"] = "1"