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

Commit 50df226b authored by Pete Gillin's avatar Pete Gillin Committed by android-build-merger
Browse files

Merge "Rename the ojluni-annotated-stubs target." am: 542d032f am: cddbd39b 

am: 59fa25a5

Change-Id: Idd9e6ee25e60b9882f3992cf1b19f929eca37621
parents 996c96d1 59fa25a5

Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -1166,7 +1166,7 @@ stubs_defaults { 
    previous_api: ":last-released-public-api",

    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

        "ojluni-annotated-stubs",

        "ojluni-annotated-sdk-stubs",

    ],

    ],

}

}
@@ -1228,7 +1228,7 @@ stubs_defaults { 
    previous_api: ":last-released-public-api",

    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

        "ojluni-annotated-stubs",

        "ojluni-annotated-sdk-stubs",

    ],

    ],

}

}
@@ -1499,7 +1499,7 @@ droidstubs { 
    previous_api: ":last-released-public-api",

    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

        "ojluni-annotated-stubs",

        "ojluni-annotated-sdk-stubs",

    ],

    ],

    args: " --show-annotation android.annotation.SystemApi",

    args: " --show-annotation android.annotation.SystemApi",

}

}