From fdaa672ad1faacf0fb279adf876841dc2ffb404e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 23 Aug 2024 11:58:08 -0700 Subject: Remove obsolete robolectric test runner integration The `m Run*RoboTests` test runner is no longer supported, remove the code to generate the Make rules for it. Also reduce the number of combining steps by passing the extra jars that need to be combined into the compile step. This relands Icf05079bf570bed7a10962cbf03459bd53c51f99 with a fix to reorder the instrumented app classes after dependency classes. Test: atest --host SystemUiRoboTests Flag: EXEMPT refactor Change-Id: I174ceb95af5557e1859eeb12a2f5fac2332975a8 --- java/aar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/aar.go') diff --git a/java/aar.go b/java/aar.go index 42866f8b6..8ceeace20 100644 --- a/java/aar.go +++ b/java/aar.go @@ -884,7 +884,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) extraSrcJars = android.Paths{a.aapt.aaptSrcJar} } - a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars) + a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars, nil) a.aarFile = android.PathForModuleOut(ctx, ctx.ModuleName()+".aar") var res android.Paths -- cgit v1.2.3-59-g8ed1b