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

Commit 41f189fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix ravenizer when transitive classpath is enabled" into main am: 2618069b 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255133



Change-Id: Ief138e5873d79c2eecd08defaa9e1ee9f28dcf41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ace2d988 2618069b

java/base.go

+6 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,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() {
@@ -1675,6 +1677,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.
@@ -1696,6 +1700,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)