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

Commit 121ccbcf authored by Anton Hansson's avatar Anton Hansson
Browse files

Stop ignoring classes on the classpath for stubs 

We're working on moving the libcore classes away from srcs and into the
classpath, and ignoring classes on the classpath will cause incorrect
API signatures once that happens (several libcore classes appear in
public API signatures).

Keep the docs building in the same way they were before. They will be
addressed in separate CLs.

Bug: 173606718
Test: m checkapi
Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
parent 96db3dad

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,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 " +

ApiDocs.bp

+7 −2
Original line number Diff line number Diff line
@@ -91,7 +91,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,

}
@@ -101,7 +103,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,

}

StubLibraries.bp

+4 −1
Original line number Diff line number Diff line
@@ -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): remove below aidl includes.

    aidl: {
@@ -77,6 +79,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,