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

Commit 70b22926 authored by Cory Barker's avatar Cory Barker Committed by Gerrit Code Review
Browse files

Merge "Add both classes jar and dexed jar to java_fuzz module packaged output... 

Merge "Add both classes jar and dexed jar to java_fuzz module packaged output for dist as we move towards instrumentation at runtime"
parents de68c07c c29c37a2

java/fuzz.go

+5 −1
Original line number Diff line number Diff line
@@ -177,7 +177,11 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { 
		files = s.PackageArtifacts(ctx, module, javaFuzzModule.fuzzPackagedModule, archDir, builder)



		// Add .jar

		files = append(files, fuzz.FileToZip{SourceFilePath: javaFuzzModule.implementationJarFile})

		if !javaFuzzModule.Host() {

			files = append(files, fuzz.FileToZip{SourceFilePath: javaFuzzModule.implementationJarFile, DestinationPathPrefix: "classes"})

		}



		files = append(files, fuzz.FileToZip{SourceFilePath: javaFuzzModule.outputFile})



		// Add jni .so files

		for _, fPath := range javaFuzzModule.jniFilePaths {