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

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

Merge "Specify `stubs_type` property in java_api_library modules" into main... 

Merge "Specify `stubs_type` property in java_api_library modules" into main am: 509fa1c6 am: ff78855f

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



Change-Id: If25eb6ca0268b3b207ab96961580083fb6f3c4c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b2e60bc ff78855f

api/StubLibraries.bp

+21 −5
Original line number Diff line number Diff line
@@ -458,13 +458,21 @@ java_defaults { 
    libs: ["stub-annotations"],

}



java_defaults {

    name: "android-non-updatable_everything_from_text_defaults",

    defaults: [

        "android-non-updatable_from_text_defaults",

    ],

    stubs_type: "everything",

}



java_api_library {

    name: "android-non-updatable.stubs.from-text",

    api_surface: "public",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    defaults: ["android-non-updatable_everything_from_text_defaults"],

    full_api_surface_stub: "android_stubs_current.from-text",

}
@@ -475,7 +483,7 @@ java_api_library { 
        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    defaults: ["android-non-updatable_everything_from_text_defaults"],

    full_api_surface_stub: "android_system_stubs_current.from-text",

}
@@ -487,7 +495,7 @@ java_api_library { 
        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    defaults: ["android-non-updatable_everything_from_text_defaults"],

    full_api_surface_stub: "android_test_stubs_current.from-text",

}
@@ -499,7 +507,7 @@ java_api_library { 
        "system-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    defaults: ["android-non-updatable_everything_from_text_defaults"],

    full_api_surface_stub: "android_module_lib_stubs_current_full.from-text",

}
@@ -515,7 +523,7 @@ java_api_library { 
        "test-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    defaults: ["android-non-updatable_everything_from_text_defaults"],

    full_api_surface_stub: "android_test_module_lib_stubs_current.from-text",



    // This module is only used for hiddenapi, and other modules should not
@@ -836,6 +844,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -852,6 +861,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -870,6 +880,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -888,6 +899,7 @@ java_api_library { 
        "system-api-stubs-docs-non-updatable.api.contribution",

    ],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -908,6 +920,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -922,6 +935,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -947,6 +961,7 @@ java_api_library { 
        "//visibility:private",

    ],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -964,6 +979,7 @@ java_api_library { 
    ],

    visibility: ["//visibility:public"],

    enable_validation: false,

    stubs_type: "everything",

}



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