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

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

Merge "Don't pass annotation srcs to metalava for modules" into rvc-dev am:... 

Merge "Don't pass annotation srcs to metalava for modules" into rvc-dev am: e90c8636 am: 247d8316 am: 73aeeae3

Change-Id: I1e12ad90d0e339f4aa213e28ce7c8ca03b4f2dd3
parents 93ff9528 73aeeae3

apex/Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ stubs_defaults { 
stubs_defaults {

stubs_defaults {

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

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

    args: mainline_stubs_args + priv_apps,

    args: mainline_stubs_args + priv_apps,

    srcs: [":framework-annotations"],

    libs: ["framework-annotations-lib"],

    installable: false,

    installable: false,

    sdk_version: "system_current",

    sdk_version: "system_current",

}

}
@@ -62,7 +62,7 @@ stubs_defaults { 
stubs_defaults {

stubs_defaults {

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

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

    args: mainline_stubs_args + module_libs,

    args: mainline_stubs_args + module_libs,

    srcs: [":framework-annotations"],

    libs: ["framework-annotations-lib"],

    installable: false,

    installable: false,

    sdk_version: "module_current",

    sdk_version: "module_current",

}

}
@@ -70,7 +70,7 @@ stubs_defaults { 
stubs_defaults {

stubs_defaults {

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

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

    args: mainline_stubs_args + module_libs + priv_apps,

    args: mainline_stubs_args + module_libs + priv_apps,

    srcs: [":framework-annotations"],

    libs: ["framework-annotations-lib"],

    installable: false,

    installable: false,

    sdk_version: "module_current",

    sdk_version: "module_current",

}
 
}