diff options
| author | 2024-09-05 21:03:26 +0000 | |
|---|---|---|
| committer | 2024-09-05 21:03:26 +0000 | |
| commit | 151446cb41b541948a49cadfec5b0f17c0a44fe6 (patch) | |
| tree | 5c2870c63a33041ce5baa9a73557746c3f4659b1 /java/base.go | |
| parent | 4e1af6942d67188bcbd468de2ab9ee6cace2c6b3 (diff) | |
| parent | fdaa672ad1faacf0fb279adf876841dc2ffb404e (diff) | |
Merge "Remove obsolete robolectric test runner integration" into main
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)) |