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

Commit 6fa9bcf6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6526429 from 99507565 to mainline-release 

Change-Id: I385053bb63587f4a1c2de7d873b60f5b9d657418
parents cecdfb68 99507565

StubLibraries.bp

+117 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ stubs_defaults { 
    // finalized stub library to resolve them. If a new class gets added,

    // this may be need to be revisited to use a manually maintained stub

    // library with empty classes in order to resolve those references.

    libs: ["sdk_system_29_android"],

    libs: ["sdk_system_30_android"],

    aidl: {

        local_include_dirs: ["apex/media/aidl/stable"],

    },
@@ -129,6 +129,23 @@ droidstubs { 
    jdiff_enabled: true,

}



droidstubs {

    name: "api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args,

    check_api: {

        current: {

            api_file: "non-updatable-api/current.txt",

            removed_api_file: "non-updatable-api/removed.txt",

        },

        api_lint: {

            enabled: true,

            new_since: ":android-non-updatable.api.public.latest",

        },

    },

}



priv_apps = " " +

    "--show-annotation android.annotation.SystemApi\\(" +

        "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
@@ -171,6 +188,24 @@ droidstubs { 
    jdiff_enabled: true,

}



droidstubs {

    name: "system-api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args + priv_apps,

    check_api: {

        current: {

            api_file: "non-updatable-api/system-current.txt",

            removed_api_file: "non-updatable-api/system-removed.txt",

        },

        api_lint: {

            enabled: true,

            new_since: ":android-non-updatable.api.system.latest",

            baseline_file: "non-updatable-api/system-lint-baseline.txt",

        },

    },

}



droidstubs {

    name: "test-api-stubs-docs",

    defaults: ["metalava-full-api-stubs-default"],
@@ -234,6 +269,22 @@ droidstubs { 
    },

}



droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    defaults: ["metalava-non-updatable-api-stubs-default"],

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args + module_libs,

    check_api: {

        current: {

            api_file: "non-updatable-api/module-lib-current.txt",

            removed_api_file: "non-updatable-api/module-lib-removed.txt",

        },

        api_lint: {

            enabled: true,

            new_since: ":android-non-updatable.api.module-lib.latest",

        },

    },

}



// The following droidstub module generates source files for the API stub library for

// modules. Note that it not only includes its own APIs but also other APIs that have
@@ -254,7 +305,6 @@ droidstubs { 
java_defaults {

    name: "android_defaults_stubs_current",

    libs: [ "stub-annotations" ],

    static_libs: [ "private-stub-annotations-jar" ],

    errorprone: {

        javacflags: [

            "-XepDisableAllChecks",
@@ -268,20 +318,69 @@ java_defaults { 
}



java_library_static {

    name: "android_stubs_current",

    name: "android_monolith_stubs_current",

    srcs: [ ":api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_stubs_current",

    name: "android_merged_stubs_current",

    srcs: [ ":api-stubs-docs-non-updatable" ],

    static_libs: [

        "conscrypt.module.public.api.stubs",

        "framework-media-stubs-publicapi",

        "framework-mediaprovider-stubs-publicapi",

        "framework-permission-stubs-publicapi",

        "framework-sdkextensions-stubs-publicapi",

        "framework-statsd-stubs-publicapi",

        "framework-tethering-stubs-publicapi",

        "framework-wifi-stubs-publicapi",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_stubs_current",

    static_libs: ["android_merged_stubs_current"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_monolith_stubs_current",

    srcs: [ ":system-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_merged_stubs_current",

    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    static_libs: [

        "conscrypt.module.public.api.stubs",

        "framework-media-stubs-systemapi",

        "framework-mediaprovider-stubs-systemapi",

        "framework-permission-stubs-systemapi",

        "framework-sdkextensions-stubs-systemapi",

        "framework-statsd-stubs-systemapi",

        "framework-tethering-stubs-systemapi",

        "framework-wifi-stubs-systemapi",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_stubs_current",

    static_libs: ["android_system_merged_stubs_current"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_test_stubs_current",

    srcs: [ ":test-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}
@@ -292,6 +391,20 @@ java_library_static { 
    libs: ["sdk_system_29_android"],

}



java_library_static {

    name: "android_non_updatable_stubs_current",

    srcs: [":api-stubs-docs-non-updatable"],

    defaults: ["android_defaults_stubs_current"],

    libs: ["sdk_system_29_android"],

}



java_library_static {

    name: "android_system_non_updatable_stubs_current",

    srcs: [":system-api-stubs-docs-non-updatable"],

    defaults: ["android_defaults_stubs_current"],

    libs: ["sdk_system_29_android"],

}



/////////////////////////////////////////////////////////////////////

// hwbinder.stubs provides APIs required for building HIDL Java

// libraries.

apex/Android.bp

+26 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ stubs_defaults { 
    args: mainline_framework_stubs_args,

    installable: false,

    sdk_version: "module_current",

    annotations_enabled: true,

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    filter_packages: framework_packages_to_document,

    check_api: {

        current: {
@@ -147,6 +151,10 @@ stubs_defaults { 
    libs: ["framework-annotations-lib"],

    installable: false,

    sdk_version: "module_current",

    annotations_enabled: true,

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    filter_packages: framework_packages_to_document,

    check_api: {

        current: {
@@ -167,6 +175,8 @@ java_defaults { 
    name: "framework-module-stubs-lib-defaults-publicapi",

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    java_version: "1.8",

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/public",
@@ -177,6 +187,8 @@ java_defaults { 
    name: "framework-module-stubs-lib-defaults-systemapi",

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    java_version: "1.8",

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/system",
@@ -187,6 +199,8 @@ java_defaults { 
    name: "framework-module-stubs-lib-defaults-module_libs_api",

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    java_version: "1.8",

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/module-lib",
@@ -204,6 +218,10 @@ stubs_defaults { 
    libs: ["framework-annotations-lib"],

    installable: false,

    sdk_version: "module_current",

    annotations_enabled: true,

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    filter_packages: framework_packages_to_document,

    check_api: {

        current: {
@@ -226,6 +244,10 @@ stubs_defaults { 
    libs: ["framework-annotations-lib"],

    installable: false,

    sdk_version: "module_current",

    annotations_enabled: true,

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    filter_packages: framework_packages_to_document,

}
@@ -233,6 +255,10 @@ stubs_defaults { 
    name: "service-module-stubs-srcs-defaults",

    args: mainline_service_stubs_args,

    installable: false,

    annotations_enabled: true,

    merge_annotations_dirs: [

        "metalava-manual",

    ],

    filter_packages: ["com.android."],

    check_api: {

        current: {

api/module-lib-current.txt

+0 −10
Original line number Diff line number Diff line 
// Signature format: 2.0

package android.annotation {



  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface NonNull {

  }



  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface Nullable {

  }



}



package android.net {



  public final class TetheredClient implements android.os.Parcelable {

core/java/android/annotation/NonNull.java

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD; 
import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.SystemApi.Client;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;
@@ -36,6 +34,5 @@ import java.lang.annotation.Target; 
 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface NonNull {

}

core/java/android/annotation/Nullable.java

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD; 
import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.SystemApi.Client;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;
@@ -43,6 +41,5 @@ import java.lang.annotation.Target; 
 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface Nullable {

}