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

Commit ad675e39 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs... 

Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions" into main am: 45e63e8f

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



Change-Id: Ifd3b9572c10066036463653531ebc4318b4fd5e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 063c174b 45e63e8f

api/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ genrule { 
    name: "sdk-annotations.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs{.annotations.zip}",

        ":android-non-updatable-doc-stubs{.exportable.annotations.zip}",

        ":all-modules-public-annotations",

    ],

}
@@ -231,7 +231,7 @@ genrule { 
    name: "sdk-annotations-system.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-system{.annotations.zip}",

        ":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",

        ":all-modules-system-annotations",

    ],

}
@@ -240,7 +240,7 @@ genrule { 
    name: "sdk-annotations-module-lib.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-module-lib{.annotations.zip}",

        ":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",

        ":all-modules-module-lib-annotations",

    ],

}
@@ -249,7 +249,7 @@ genrule { 
    name: "sdk-annotations-system-server.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-system-server{.annotations.zip}",

        ":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",

        ":all-modules-system-server-annotations",

    ],

}

api/ApiDocs.bp

+6 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ droiddoc { 
    name: "offline-sdk-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc offline",
@@ -241,7 +241,7 @@ droiddoc { 
    name: "offline-sdk-referenceonly-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc offline",
@@ -285,7 +285,7 @@ droiddoc { 
    name: "ds-docs-java",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc online",
@@ -319,7 +319,7 @@ droiddoc { 
droiddoc {

    name: "ds-docs-kt",

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    flags: [

        "-noJdkLink",
@@ -373,7 +373,7 @@ droiddoc { 
    name: "ds-static-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc online",
@@ -390,7 +390,7 @@ droiddoc { 
    name: "ds-ref-navtree-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc online",

api/StubLibraries.bp

+4 −4
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ java_api_library { 
java_library {

    name: "android_stubs_current_with_test_libs",

    static_libs: [

        "android_stubs_current",

        "android_stubs_current_exportable",

        "android.test.base.stubs",

        "android.test.mock.stubs",

        "android.test.runner.stubs",
@@ -976,7 +976,7 @@ java_library { 
java_library {

    name: "android_system_stubs_current_with_test_libs",

    static_libs: [

        "android_system_stubs_current",

        "android_system_stubs_current_exportable",

        "android.test.base.stubs.system",

        "android.test.mock.stubs.system",

        "android.test.runner.stubs.system",
@@ -991,7 +991,7 @@ java_library { 
java_library {

    name: "android_module_stubs_current_with_test_libs",

    static_libs: [

        "android_module_lib_stubs_current",

        "android_module_lib_stubs_current_exportable",

        "android.test.base.stubs",

        "android.test.mock.stubs",

        "android.test.runner.stubs",
@@ -1006,7 +1006,7 @@ java_library { 
java_library {

    name: "android_system_server_stubs_current_with_test_libs",

    static_libs: [

        "android_system_server_stubs_current",

        "android_system_server_stubs_current_exportable",

        "android.test.base.stubs.system",

        "android.test.mock.stubs.system",

        "android.test.runner.stubs.system",