StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reverse merge order of resources and implementation"

Browse Source
This commit is contained in:
Treehugger Robot
2019-05-02 03:04:24 +00:00
committed by Gerrit Code Review
parent 60a839dd42 08a409df2d
commit b5ad835dfe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -1253,9 +1253,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
// merge implementation jar with resources if necessary // merge implementation jar with resources if necessary
implementationAndResourcesJar := outputFile implementationAndResourcesJar := outputFile
if j.resourceJar != nil { if j.resourceJar != nil {
jars := android.Paths{implementationAndResourcesJar, j.resourceJar} jars := android.Paths{j.resourceJar, implementationAndResourcesJar}
combinedJar := android.PathForModuleOut(ctx, "withres", jarName) combinedJar := android.PathForModuleOut(ctx, "withres", jarName)
TransformJarsToJar(ctx, combinedJar, "for resources", jars, android.OptionalPath{}, TransformJarsToJar(ctx, combinedJar, "for resources", jars, manifest,
false, nil, nil) false, nil, nil)
implementationAndResourcesJar = combinedJar implementationAndResourcesJar = combinedJar
} }