From 969f8f0a25f17c06e65ef658a47aef786482b60d Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Tue, 26 Apr 2022 18:34:55 +0000 Subject: [PATCH] disable usage of plugins as static libs Test: m auto_value_plugin Test: m androidx.appsearch_appsearch-compiler Test: m intdef-annotation-processor-test Test: atest intdef-annotation-processor-test Test: m view-inspector-annotation-processor-test Test: atest view-inspector-annotation-processor-test Test: m Robolectric_processor_tests Test: atest Robolectric_processor_tests Bug: 225388628 Change-Id: I9e3dd81f44333b680f2e81283c02a9be5a4de15b (cherry picked from commit 0d1c4a0feeef13da40cb2f25a24923d48f87a473) Merged-In: I9e3dd81f44333b680f2e81283c02a9be5a4de15b --- java/base.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/base.go b/java/base.go index 58c16492d..73a364939 100644 --- a/java/base.go +++ b/java/base.go @@ -1937,6 +1937,9 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { case bootClasspathTag: deps.bootClasspath = append(deps.bootClasspath, dep.HeaderJars...) case libTag, instrumentationForTag: + if _, ok := module.(*Plugin); ok { + ctx.ModuleErrorf("a java_plugin (%s) cannot be used as a libs dependency", otherName) + } deps.classpath = append(deps.classpath, dep.HeaderJars...) deps.dexClasspath = append(deps.dexClasspath, dep.HeaderJars...) deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs...) @@ -1945,6 +1948,9 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { case java9LibTag: deps.java9Classpath = append(deps.java9Classpath, dep.HeaderJars...) case staticLibTag: + if _, ok := module.(*Plugin); ok { + ctx.ModuleErrorf("a java_plugin (%s) cannot be used as a static_libs dependency", otherName) + } deps.classpath = append(deps.classpath, dep.HeaderJars...) deps.staticJars = append(deps.staticJars, dep.ImplementationJars...) deps.staticHeaderJars = append(deps.staticHeaderJars, dep.HeaderJars...)