Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5ad835d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reverse merge order of resources and implementation"

parents 60a839dd 08a409df

java/java.go

+2 −2
Original line number Diff line number Diff line
@@ -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

	}