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

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

Merge "Fix ravenizer when transitive classpath is enabled" into main

parents 219009f6 7e86385f

java/base.go

+6 −0
Original line number Diff line number Diff line
@@ -1668,6 +1668,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath 
			Output:      ravenizerOutput,

		})

		outputFile = ravenizerOutput

		localImplementationJars = android.Paths{ravenizerOutput}

		completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)

	}



	if j.shouldApiMapper() {
@@ -1680,6 +1682,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath 
			Output:      apiMapperFile,

		})

		outputFile = apiMapperFile

		localImplementationJars = android.Paths{apiMapperFile}

		completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)

	}



	// Check package restrictions if necessary.
@@ -1701,6 +1705,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath 
			Validation: pkgckFile,

		})

		outputFile = packageCheckOutputFile

		localImplementationJars = android.Paths{packageCheckOutputFile}

		completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)



		// Check packages and create a timestamp file when complete.

		CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages)