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

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

Merge "Include annotations in module metalava runs" into rvc-dev am:... 

Merge "Include annotations in module metalava runs" into rvc-dev am: b0033693 am: ea3eb82f am: d2a807b8

Change-Id: I928ce25cd8f771b8e2ece7497317c0dbf5725ded
parents bf554215 d2a807b8

apex/Android.bp

+23 −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,7 @@ java_defaults { 
    name: "framework-module-stubs-lib-defaults-publicapi",

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    dist: {

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

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

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    dist: {

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

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

    installable: false,

    sdk_version: "module_current",

    libs: [ "stub-annotations" ],

    dist: {

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

        dir: "apistubs/android/module-lib",
@@ -204,6 +215,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,



    // Do not generate stubs as they are not needed
@@ -230,6 +245,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,

}
@@ -237,6 +256,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: {