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

Commit e9f3ada7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into... 

Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202

Change-Id: I2d713997ba5ebf87c74adb86e0248266bdaa897f
parents ec01225c 55daa202

apex/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ mainline_stubs_args += "--hide-package com.android.server " 


priv_apps = " " +

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

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

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

    "\\) "



module_libs = " " +

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

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

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

    "\\) "



stubs_defaults {
@@ -48,6 +48,7 @@ stubs_defaults { 
stubs_defaults {

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

    args: mainline_stubs_args + priv_apps,

    srcs: [":framework-annotations"],

    installable: false,

}
@@ -59,11 +60,13 @@ stubs_defaults { 
stubs_defaults {

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

    args: mainline_stubs_args + module_libs,

    srcs: [":framework-annotations"],

    installable: false,

}



stubs_defaults {

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

    args: mainline_stubs_args + module_libs + priv_apps,

    srcs: [":framework-annotations"],

    installable: false,

}