diff options
| author | Colin Cross <ccross@android.com> | 2019-04-29 10:22:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-29 10:29:24 -0700 |
| commit | 08a409df2d2b6a6b04b0edbdeb2a689fe268376e (patch) | |
| tree | 2295c86a410fabcbd4f3f29f8a0d643bdf3a0507 /java/java.go | |
| parent | 77b47fdf511c9fb3d619789e9f3e72f9a762e96d (diff) | |
Reverse merge order of resources and implementation
Merge the resources first in case one of the static libraries
merge into the implementation jars contains a duplicate resource.
Also put the manifest into the resource jar so that the default
manifest doens't override the custom manifest.
Test: m checkbuild
Change-Id: I96d117c306bc9f1346720251d3993031992cef66
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 6168b38d4..47dd95724 100644 --- a/java/java.go +++ b/java/java.go @@ -1253,9 +1253,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path // merge implementation jar with resources if necessary implementationAndResourcesJar := outputFile if j.resourceJar != nil { - jars := android.Paths{implementationAndResourcesJar, j.resourceJar} + jars := android.Paths{j.resourceJar, implementationAndResourcesJar} combinedJar := android.PathForModuleOut(ctx, "withres", jarName) - TransformJarsToJar(ctx, combinedJar, "for resources", jars, android.OptionalPath{}, + TransformJarsToJar(ctx, combinedJar, "for resources", jars, manifest, false, nil, nil) implementationAndResourcesJar = combinedJar } |