diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | ApiDocs.bp | 9 | ||||
| -rw-r--r-- | StubLibraries.bp | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 0e40ef7b9e07..f8e5e8e6f587 100644 --- a/Android.bp +++ b/Android.bp @@ -1374,7 +1374,6 @@ filegroup { // TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + - "--ignore-classes-on-classpath " + "--hide-package com.android.server " + "--hide-package android.audio.policy.configuration.V7_0 " + "--error UnhiddenSystemApi " + 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, } diff --git a/StubLibraries.bp b/StubLibraries.bp index 12ee889387ec..05967558178e 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -50,7 +50,9 @@ stubs_defaults { ":art.module.public.api{.public.stubs.source}", "**/package.html", ], - sdk_version: "core_platform", + sdk_version: "none", + system_modules: "none", + java_version: "1.8", arg_files: ["core/res/AndroidManifest.xml"], // TODO(b/147699819, b/169090544): remove below aidl includes. aidl: { @@ -80,6 +82,7 @@ stubs_defaults { "android.hardware.usb.gadget-V1.0-java", "android.hardware.vibrator-V1.3-java", "framework-protos", + "stable.core.platform.api.stubs", // There are a few classes from modules used as type arguments that // need to be resolved by metalava. For now, we can use a previously // finalized stub library to resolve them. If a new class gets added, |