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

Commit 3478239c authored by Adrian Roos's avatar Adrian Roos
Browse files

apilint: Lint unhidden @IntDef and @LongDef 

@IntDefs and @LongDefs cannot be stored in a .class file, because the constant
names are lost. Instead, they are packaged out-of-band.

Therefore, they should never be in the API.

Test: python tools/apilint/apilint.py api/current.txt
Change-Id: If22e0cf7db0bb90dae6174bf546f2ec8be4e5458
parent 26968d81

tools/apilint/apilint.py

+13 −2
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ class Class(): 
        self.ctors = []

        self.fields = []

        self.methods = []

        self.annotations = []



        if sig_format == 2:

            V2LineParser(raw).parse_into_class(self)
@@ -353,8 +354,8 @@ class V2LineParser(object): 


    def parse_into_class(self, clazz):

        clazz.split = []

        annotations = self.parse_annotations()

        if "@Deprecated" in annotations:

        clazz.annotations = self.parse_annotations()

        if "@Deprecated" in clazz.annotations:

            clazz.split.append("deprecated")

        clazz.split.extend(self.parse_modifiers())

        kind = self.parse_one_of("class", "interface", "@interface", "enum")
@@ -1999,6 +2000,16 @@ def has_nullability(annotations): 
    return "@NonNull" in annotations or "@Nullable" in annotations





@verifier

def verify_intdef(clazz):

    """intdefs must be @hide, because the constant names cannot be stored in

       the stubs (only the values are, which is not useful)"""

    if "@interface" not in clazz.split:

        return

    if "@IntDef" in clazz.annotations or "@LongDef" in clazz.annotations:

        error(clazz, None, None, "@IntDef and @LongDef annotations must be @hide")





@verifier

def verify_singleton(clazz):

    """Catch singleton objects with constructors."""