Merge "Clarify error message when signature in list.txt does not exist." am: a6ed7b79ed am: 5072b29f66 am: e8757a24ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473730

Change-Id: I52f51f9a50d264033e4790298c9c136c63512610
This commit is contained in:
Mathew Inwood
2020-10-27 14:02:52 +00:00
committed by Automerger Merge Worker

View File

@@ -188,11 +188,10 @@ class FlagsDict:
def _check_entries_set(self, keys_subset, source):
assert isinstance(keys_subset, set)
assert keys_subset.issubset(self._dict_keyset), (
"Error processing: {}\n"
"The following entries were unexpected:\n"
"Error: {} specifies signatures not present in code:\n"
"{}"
"Please visit go/hiddenapi for more information.").format(
source, "".join(map(lambda x: " " + str(x), keys_subset - self._dict_keyset)))
source, "".join(map(lambda x: " " + str(x) + "\n", keys_subset - self._dict_keyset)))
def _check_flags_set(self, flags_subset, source):
assert isinstance(flags_subset, set)