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

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

Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5 am: 4d79002c 

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

Change-Id: I2a9e255364c15f598bb7ecc7bdfde753d38d647f
parents 77b07ba3 4d79002c

Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,18 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x 
    "--api-lint-ignore-prefix junit. " +

    "--api-lint-ignore-prefix org. "



filegroup {

    name: "framework-non-updatable-stub-sources",

    srcs: [

        ":framework-non-updatable-sources",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        "core/java/**/*.logtags",

        "**/package.html",

    ],

    visibility: ["//visibility:private"],

}



build = [

    "StubLibraries.bp",

    "ApiDocs.bp",

ApiDocs.bp

+1 −5
Original line number Diff line number Diff line
@@ -58,19 +58,15 @@ framework_docs_only_libs = [ 
stubs_defaults {

    name: "framework-doc-stubs-default",

    srcs: [

        ":framework-non-updatable-stub-sources",

        ":framework-mime-sources",

        ":framework-non-updatable-sources",

        ":framework-updatable-sources",

        "core/java/**/*.logtags",

        "test-base/src/**/*.java",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":i18n.module.public.api{.public.stubs.source}",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

        "**/package.html",

    ],

    libs: framework_docs_only_libs,

    create_doc_stubs: true,

StubLibraries.bp

+1 −7
Original line number Diff line number Diff line
@@ -42,13 +42,7 @@ packages_to_document = [ 


stubs_defaults {

    name: "metalava-non-updatable-api-stubs-default",

    srcs: [

        ":framework-non-updatable-sources",

        "core/java/**/*.logtags",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        "**/package.html",

    ],

    srcs: [":framework-non-updatable-stub-sources"],

    sdk_version: "none",

    system_modules: "none",

    java_version: "1.8",