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

Commit 6080e03a authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Stop ignoring classes on the classpath for stubs" am: 61e082ab am:... 

Merge "Stop ignoring classes on the classpath for stubs" am: 61e082ab am: ab3f2d3a am: 81bfcb40

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
parents 379446ed 81bfcb40

Android.bp

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

ApiDocs.bp

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

}

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, 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,