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

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

Merge "Modify non updatable droidstubs dependency based on release flag" into... 

Merge "Modify non updatable droidstubs dependency based on release flag" into main am: badbb20d am: 41a5c0df

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



Change-Id: Idad564372e7f33bd3acd56fd51a54cfd6f771b01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 564df5d4 41a5c0df

api/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -382,6 +382,18 @@ stubs_defaults { 
    ],

}



soong_config_module_type {

    name: "non_updatable_exportable_droidstubs",

    module_type: "droidstubs",

    config_namespace: "ANDROID",

    bool_variables: [

        "release_hidden_api_exportable_stubs",

    ],

    properties: [

        "dists",

    ],

}



// We resolve dependencies on APIs in modules by depending on a prebuilt of the whole

// platform (sdk_system_current_android). That prebuilt does not include module-lib APIs,

// so use the prebuilt module-lib stubs for modules that export module-lib stubs that the

api/StubLibraries.bp

+109 −14
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ 
// These modules provide source files for the stub libraries

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



droidstubs {

soong_config_module_type_import {

    from: "frameworks/base/api/Android.bp",

    module_types: ["non_updatable_exportable_droidstubs"],

}



non_updatable_exportable_droidstubs {

    name: "api-stubs-docs-non-updatable",

    defaults: [

        "android-non-updatable-stubs-defaults",
@@ -54,15 +59,35 @@ droidstubs { 
            targets: ["sdk"],

            dir: "apistubs/android/public/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/public/api",

            dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                ],

            },

        },

    },

    api_surface: "public",

}
@@ -86,7 +111,7 @@ module_libs = [ 
        "\\)",

]



droidstubs {

non_updatable_exportable_droidstubs {

    name: "system-api-stubs-docs-non-updatable",

    defaults: [

        "android-non-updatable-stubs-defaults",
@@ -114,19 +139,39 @@ droidstubs { 
            targets: ["sdk"],

            dir: "apistubs/android/system/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system/api",

            dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                ],

            },

        },

    },

    api_surface: "system",

}



droidstubs {

non_updatable_exportable_droidstubs {

    name: "test-api-stubs-docs-non-updatable",

    defaults: [

        "android-non-updatable-stubs-defaults",
@@ -149,31 +194,61 @@ droidstubs { 
            targets: ["sdk"],

            dir: "apistubs/android/test/api",

            dest: "android.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/test/api",

            dest: "removed.txt",

            tag: ".removed-api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/test/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/test/api",

            dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                ],

            },

        },

    },

    api_surface: "test",

}



droidstubs {

non_updatable_exportable_droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    defaults: [

        "android-non-updatable-stubs-defaults",
@@ -201,15 +276,35 @@ droidstubs { 
            targets: ["sdk"],

            dir: "apistubs/android/module-lib/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/module-lib/api",

            dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                ],

            },

        },

    },

    api_surface: "module-lib",

}

services/Android.bp

+31 −4
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ filegroup { 
// API stub

// =============================================================



soong_config_module_type_import {

    from: "frameworks/base/api/Android.bp",

    module_types: ["non_updatable_exportable_droidstubs"],

}



stubs_defaults {

    name: "services-stubs-default",

    installable: false,
@@ -301,10 +306,12 @@ stubs_defaults { 
    filter_packages: ["com.android."],

}



droidstubs {

non_updatable_exportable_droidstubs {

    name: "services-non-updatable-stubs",

    srcs: [":services-non-updatable-sources"],

    defaults: ["services-stubs-default"],

    defaults: [

        "services-stubs-default",

    ],

    check_api: {

        current: {

            api_file: "api/current.txt",
@@ -321,14 +328,34 @@ droidstubs { 
            targets: ["sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        tag: ".api.txt",

                    },

                    {

                        tag: ".removed-api.txt",

                    },

                ],

            },

        },

    },

    api_surface: "system-server",

}