From 397eb47191b2edb6b807943027c6ac19e2874853 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 13 Mar 2020 16:28:21 +0000 Subject: [PATCH] Don't pass annotation srcs to metalava for modules Doing so can make these annotation end up in API tracking files for modules, which we don't want. Put them on the classpath instead. Bug: 147768409 Test: m Change-Id: Ibb044c099174ee8591e14b6e2c683a46c1a756ef Merged-In: Ibb044c099174ee8591e14b6e2c683a46c1a756ef --- apex/Android.bp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apex/Android.bp b/apex/Android.bp index 151091137c9ce..39137fb908d2e 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -49,7 +49,7 @@ stubs_defaults { stubs_defaults { name: "framework-module-stubs-defaults-systemapi", args: mainline_stubs_args + priv_apps, - srcs: [":framework-annotations"], + libs: ["framework-annotations-lib"], installable: false, sdk_version: "system_current", } @@ -62,7 +62,7 @@ stubs_defaults { stubs_defaults { name: "framework-module-api-defaults-module_libs_api", args: mainline_stubs_args + module_libs, - srcs: [":framework-annotations"], + libs: ["framework-annotations-lib"], installable: false, sdk_version: "module_current", } @@ -70,7 +70,7 @@ stubs_defaults { stubs_defaults { name: "framework-module-stubs-defaults-module_libs_api", args: mainline_stubs_args + module_libs + priv_apps, - srcs: [":framework-annotations"], + libs: ["framework-annotations-lib"], installable: false, sdk_version: "module_current", }