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

Commit 51c1f853 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Allow obfuscated classes on bootclasspath"

parents 358ba4f0 0f386bc1

scripts/hiddenapi/signature_trie.py

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ class InteriorNode(Node): 
                                f"wildcard '{last_element}' and "

                                f"member signature '{member[0]}'")

            wildcard = [last_element]

        elif last_element.islower():

            raise Exception(f"Invalid signature '{signature}': last element "

                            f"'{last_element}' is lower case but should be an "

                            f"upper case class name or wildcard")

        else:

            packages = elements[0:-1]

            # Split the class name into outer / inner classes

scripts/hiddenapi/signature_trie_test.py

+0 −8
Original line number Diff line number Diff line
@@ -117,14 +117,6 @@ class TestSignatureToElements(unittest.TestCase): 
        self.assertEqual(elements, self.signature_to_elements(signature))

        self.assertEqual(signature, self.elements_to_signature(elements))



    def test_invalid_no_class_or_wildcard(self):

        signature = "java/lang"

        with self.assertRaises(Exception) as context:

            self.signature_to_elements(signature)

        self.assertIn(

            "last element 'lang' is lower case but should be an "

            "upper case class name or wildcard", str(context.exception))



    def test_non_standard_class_name(self):

        elements = [

            ("package", "javax"),