diff options
| author | 2024-08-23 11:58:08 -0700 | |
|---|---|---|
| committer | 2024-09-04 15:47:11 -0700 | |
| commit | fdaa672ad1faacf0fb279adf876841dc2ffb404e (patch) | |
| tree | 865c1831ad841e4d8f07e54b1b84b1a9886e5a26 /java/app.go | |
| parent | c55b25f125093f9f8257b7649a0b6cb8127d0646 (diff) | |
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
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go index d5c220d9d..4ac42a750 100644 --- a/java/app.go +++ b/java/app.go @@ -690,7 +690,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) (android.Path, a extraSrcJars = android.Paths{a.aapt.aaptSrcJar} } - a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars) + a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars, nil) if a.dexProperties.resourceShrinkingEnabled(ctx) { binaryResources := android.PathForModuleOut(ctx, packageResources.Base()+".binary.out.apk") aapt2Convert(ctx, binaryResources, a.dexer.resourcesOutput.Path(), "binary") |