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

Commit 64b7d402 authored by Paul Duffin's avatar Paul Duffin
Browse files

Stop merging in annotations from ojluni-annotated-sdk-stubs 

The annotations are already merged into the stubs that are exported
from libcore so this is unnecessary.

Bug: 142113521
Test: m checkbuild
      test this change does not change offline-sdk-docs
Change-Id: Icb0b61f80c91f96eaa22a7f1b92ffdf1825636c8
parent 6e914e8b

Android.bp

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

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

}
@@ -1077,7 +1076,6 @@ stubs_defaults { 
    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

    api_levels_annotations_enabled: true,

    api_levels_annotations_dirs: [
@@ -1412,7 +1410,6 @@ droidstubs { 
    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

        "metalava-manual",

        "ojluni-annotated-sdk-stubs",

    ],

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

}