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

Commit 2a829bb5 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions 

This change modifies the sdk-annotations-*.zip definitions so that the
modules depend on the exportable annotations.zip files instead of the
everything annotations.zip files.

This change also modifies the definition of the
android_*_stubs_current_with_test_libs modules definitions to depend on
the exportable stubs.

Likewise, the droiddoc modules now depend on the exportable stubs.

Test: m docs dist && inspect ninja file to verify that everything stubs are not exported
Test: m sdk dist && inspect api-versions.xml file and verify that the disabled apis are not included
Bug: 323261972
Change-Id: I015921f0d006bac29492be22b83043b39a8fe8eb
parent ed2395aa

api/Android.bp

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

    ],

}
@@ -240,7 +240,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",

    ],

}
@@ -249,7 +249,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",

    ],

}
@@ -258,7 +258,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
@@ -207,7 +207,7 @@ droiddoc { 
    name: "offline-sdk-docs",

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

    srcs: [

        ":framework-doc-stubs",

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

    ],

    hdf: [

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

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

    srcs: [

        ":framework-doc-stubs",

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

    ],

    hdf: [

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

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

    srcs: [

        ":framework-doc-stubs",

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

    ],

    hdf: [

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

    name: "ds-docs-kt",

    srcs: [

        ":framework-doc-stubs",

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

    ],

    flags: [

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

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

    srcs: [

        ":framework-doc-stubs",

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

    ],

    hdf: [

        "android.whichdoc online",
@@ -377,7 +377,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
@@ -962,7 +962,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",
@@ -977,7 +977,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",
@@ -992,7 +992,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",
@@ -1007,7 +1007,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",