diff options
| author | 2024-08-23 11:58:08 -0700 | |
|---|---|---|
| committer | 2024-09-04 15:47:11 -0700 | |
| commit | fdaa672ad1faacf0fb279adf876841dc2ffb404e (patch) | |
| tree | 865c1831ad841e4d8f07e54b1b84b1a9886e5a26 /java/base.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/base.go')
| -rw-r--r-- | java/base.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/base.go b/java/base.go index 75b552fd6..a31c8489b 100644 --- a/java/base.go +++ b/java/base.go @@ -1156,7 +1156,7 @@ func (j *Module) addGeneratedSrcJars(path android.Path) { j.properties.Generated_srcjars = append(j.properties.Generated_srcjars, path) } -func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspathJars, extraCombinedJars android.Paths) { +func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspathJars, extraCombinedJars, extraDepCombinedJars android.Paths) { // Auto-propagating jarjar rules jarjarProviderData := j.collectJarJarRules(ctx) if jarjarProviderData != nil { @@ -1521,6 +1521,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath jars = append(jars, deps.staticJars...) } + jars = append(jars, extraDepCombinedJars...) + manifest := j.overrideManifest if !manifest.Valid() && j.properties.Manifest != nil { manifest = android.OptionalPathForPath(android.PathForModuleSrc(ctx, *j.properties.Manifest)) |