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

Commit 7de644ff authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs" am: 1a2b9406 am: 2795f9dd 

am: a9b90e91

Change-Id: I2aed877054e40ccc0f479194cb38aae0270ceb3f
parents caf996ac a9b90e91

Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -1022,7 +1022,6 @@ stubs_defaults { 
    previous_api: ":last-released-public-api-for-metalava-annotations",

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

}
@@ -1079,7 +1078,6 @@ stubs_defaults { 
    previous_api: ":last-released-public-api-for-metalava-annotations",

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

    api_levels_annotations_enabled: true,

    api_levels_annotations_dirs: [
@@ -1414,7 +1412,6 @@ droidstubs { 
    previous_api: ":last-released-public-api-for-metalava-annotations",

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

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

}