diff options
| author | 2024-09-05 21:07:40 +0000 | |
|---|---|---|
| committer | 2024-09-05 21:07:40 +0000 | |
| commit | 392aae7702d17759ddb74a5e293e09e546836abc (patch) | |
| tree | 44e2b890211703db7b9fd16eff50aa9c9f4d204a /java/base.go | |
| parent | ddb9f16c2c8f869a42b9770b010939bc9d5b4e3d (diff) | |
| parent | 151446cb41b541948a49cadfec5b0f17c0a44fe6 (diff) | |
Merge "Remove obsolete robolectric test runner integration" into main am: 151446cb41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254252
Change-Id: Ib1d5f7a2fa7491e1ecbb4873513c182d309275f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 c6bbd4e43..1d9ba963a 100644 --- a/java/base.go +++ b/java/base.go @@ -1153,7 +1153,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 { @@ -1516,6 +1516,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)) |