Merge "Add both classes jar and dexed jar to java_fuzz module packaged output for dist as we move towards instrumentation at runtime"
This commit is contained in:
@@ -177,7 +177,11 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
|
|||||||
files = s.PackageArtifacts(ctx, module, javaFuzzModule.fuzzPackagedModule, archDir, builder)
|
files = s.PackageArtifacts(ctx, module, javaFuzzModule.fuzzPackagedModule, archDir, builder)
|
||||||
|
|
||||||
// Add .jar
|
// 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
|
// Add jni .so files
|
||||||
for _, fPath := range javaFuzzModule.jniFilePaths {
|
for _, fPath := range javaFuzzModule.jniFilePaths {
|
||||||
|
Reference in New Issue
Block a user