diff options
| author | Anton Hansson <hansson@google.com> | 2020-12-22 12:34:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 12:34:57 +0000 |
| commit | 6080e03adf39797252ac60a83d0228d992db93c2 (patch) | |
| tree | af1296b0a6befd6dff2bf129f7c47014a1a62341 /ApiDocs.bp | |
| parent | 379446ed6b1ab288036259959b20b552b623867c (diff) | |
| parent | 81bfcb40a388f15238651c2d631e0372f6e8d029 (diff) | |
Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
Diffstat (limited to 'ApiDocs.bp')
| -rw-r--r-- | ApiDocs.bp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 3d6bdbf19264..5f4f3c2f175b 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -96,7 +96,9 @@ droidstubs { arg_files: [ "core/res/AndroidManifest.xml", ], - args: metalava_framework_docs_args, + args: metalava_framework_docs_args + + // Needed for hidden libcore annotations for now. + " --ignore-classes-on-classpath ", write_sdk_values: true, } @@ -106,7 +108,10 @@ droidstubs { arg_files: [ "core/res/AndroidManifest.xml", ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", + args: metalava_framework_docs_args + + // Needed for hidden libcore annotations for now. + " --ignore-classes-on-classpath " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", write_sdk_values: true, } |