Merge "Prevent using android_app_import in instrumentation_for property"

2022-01-13 11:56:52 +00:00
parent 3a1a4b070e 53a70a4870
commit da88a2599a
2 changed files with 27 additions and 1 deletions
--- a/java/base.go
+++ b/java/base.go
@@ -1945,6 +1945,9 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
 				sm := module.(SystemModulesProvider)
 				outputDir, outputDeps := sm.OutputDirAndDeps()
 				deps.systemModules = &systemModules{outputDir, outputDeps}
+
+			case instrumentationForTag:
+				ctx.PropertyErrorf("instrumentation_for", "dependency %q of type %q does not provide JavaInfo so is unsuitable for use with this property", ctx.OtherModuleName(module), ctx.OtherModuleType(module))
 			}
 		}