diff options
| author | 2019-05-02 03:04:24 +0000 | |
|---|---|---|
| committer | 2019-05-02 03:04:24 +0000 | |
| commit | b5ad835dfe48fdc21d893b206f4828cdd27a1b4a (patch) | |
| tree | 383e6777cdda768727b6d0fc994dcc5ded0cf5c7 /java/java.go | |
| parent | 60a839dd423209901b28827c5fcdae075a61aa6f (diff) | |
| parent | 08a409df2d2b6a6b04b0edbdeb2a689fe268376e (diff) | |
Merge "Reverse merge order of resources and implementation"
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 } |