StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "remove_suffixes" am: a321926546 am: 38811402f3 am: 1a79e2e83a

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

Change-Id: Id2256bd1f94a0eb0e51a17d050acb41f21cab16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-10 22:32:27 +00:00
committed by Automerger Merge Worker
parent 8931fb1ba8 1a79e2e83a
commit a37eb7e52b
10 changed files with 153 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/fuzz.go
View File

@@ -175,11 +175,11 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
files = s.PackageArtifacts(ctx, module, javaFuzzModule.fuzzPackagedModule, archDir, builder)
// Add .jar
files = append(files, fuzz.FileToZip{javaFuzzModule.implementationJarFile, ""})
files = append(files, fuzz.FileToZip{SourceFilePath: javaFuzzModule.implementationJarFile})
// Add jni .so files
for _, fPath := range javaFuzzModule.jniFilePaths {
files = append(files, fuzz.FileToZip{fPath, ""})
files = append(files, fuzz.FileToZip{SourceFilePath: fPath})
}
archDirs[archOs], ok = s.BuildZipFile(ctx, module, javaFuzzModule.fuzzPackagedModule, files, builder, archDir, archString, hostOrTargetString, archOs, archDirs)