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

Commit 99703f78 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Tweak the defaults of module stubs" am: b5997d27 

Change-Id: I58560b8474aa907a99e6a8f1c38e3e364e832086
parents 8586776f b5997d27

apex/Android.bp

+19 −22
Original line number Original line Diff line number Diff line
@@ -29,6 +29,16 @@ mainline_stubs_args = 
// TODO: remove this server classes are cleaned up.

// TODO: remove this server classes are cleaned up.

mainline_stubs_args += "--hide-package com.android.server "

mainline_stubs_args += "--hide-package com.android.server "





priv_apps = " " +

    "--show-annotation android.annotation.SystemApi\\(" +

        "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +

    "\\) "



module_libs = " " +

    " --show-annotation android.annotation.SystemApi\\(" +

        "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +

    "\\) "



stubs_defaults {

stubs_defaults {

    name: "framework-module-stubs-defaults-publicapi",

    name: "framework-module-stubs-defaults-publicapi",

    args: mainline_stubs_args,

    args: mainline_stubs_args,
@@ -37,36 +47,23 @@ stubs_defaults { 




stubs_defaults {

stubs_defaults {

    name: "framework-module-stubs-defaults-systemapi",

    name: "framework-module-stubs-defaults-systemapi",

    args: mainline_stubs_args +

    args: mainline_stubs_args + priv_apps,

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +

    "process=android.annotation.SystemApi.Process.ALL\\) ",

    installable: false,

    installable: false,

}

}





// The defaults for module_libs comes in two parts - defaults for API checks

// and defaults for stub generation. This is because we want the API txt

// files to *only* include the module_libs_api, but the stubs to include

// module_libs_api as well as priv_apps.



stubs_defaults {

stubs_defaults {

    name: "framework-module-stubs-defaults-module_apps_api",

    name: "framework-module-api-defaults-module_libs_api",

    args: mainline_stubs_args +

    args: mainline_stubs_args + module_libs,

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +

    "process=android.annotation.SystemApi.Process.ALL\\) " +

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.MODULE_APPS," +

    "process=android.annotation.SystemApi.Process.ALL\\) ",

    installable: false,

    installable: false,

}

}





stubs_defaults {

stubs_defaults {

    name: "framework-module-stubs-defaults-module_libs_api",

    name: "framework-module-stubs-defaults-module_libs_api",

    args: mainline_stubs_args +

    args: mainline_stubs_args + module_libs + priv_apps,

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +

    "process=android.annotation.SystemApi.Process.ALL\\) " +

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.MODULE_APPS," +

    "process=android.annotation.SystemApi.Process.ALL\\) " +

    " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +

    "process=android.annotation.SystemApi.Process.ALL\\) ",

    installable: false,

    installable: false,

}
 
}