Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5072b29f authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

Merge "Clarify error message when signature in list.txt does not exist." am: a6ed7b79 

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

Change-Id: I4b66f6006526ddbabaaeaf903799d012dc4b991a
parents 13444871 a6ed7b79

tools/hiddenapi/generate_hiddenapi_lists.py

+2 −3
Original line number Original line Diff line number Diff line
@@ -188,11 +188,10 @@ class FlagsDict: 
    def _check_entries_set(self, keys_subset, source):

    def _check_entries_set(self, keys_subset, source):

        assert isinstance(keys_subset, set)

        assert isinstance(keys_subset, set)

        assert keys_subset.issubset(self._dict_keyset), (

        assert keys_subset.issubset(self._dict_keyset), (

            "Error processing: {}\n"

            "Error: {} specifies signatures not present in code:\n"

            "The following entries were unexpected:\n"

            "{}"

            "{}"

            "Please visit go/hiddenapi for more information.").format(

            "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):

    def _check_flags_set(self, flags_subset, source):

        assert isinstance(flags_subset, set)

        assert isinstance(flags_subset, set)