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

Commit ff78855f 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 am: 509fa1c6 

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



Change-Id: I2d62183af207d339a7d3839793ca4366c3163639
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca0cbb96 509fa1c6

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
@@ -827,6 +835,7 @@ java_api_library { 
    ],

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

    enable_validation: false,

    stubs_type: "everything",

}



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

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

    enable_validation: false,

    stubs_type: "everything",

}



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

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

    enable_validation: false,

    stubs_type: "everything",

}



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

    ],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -899,6 +911,7 @@ java_api_library { 
    ],

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

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -913,6 +926,7 @@ java_api_library { 
    ],

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

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -938,6 +952,7 @@ java_api_library { 
        "//visibility:private",

    ],

    enable_validation: false,

    stubs_type: "everything",

}



java_api_library {
@@ -955,6 +970,7 @@ java_api_library { 
    ],

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

    enable_validation: false,

    stubs_type: "everything",

}



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