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

Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a

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

Change-Id: I7c94b0fb24d2c4a272308a932f1261638d94a546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-18 18:56:02 +00:00
committed by Automerger Merge Worker
parent 48b6649189 35bc07cb2a
commit 16542620eb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/aar.go
View File

@@ -993,7 +993,7 @@ var extractJNI = pctx.AndroidStaticRule("extractJNI",
`jni_files=$$(find $outDir/jni -type f) && ` + `jni_files=$$(find $outDir/jni -type f) && ` +
// print error message if there are no JNI libs for this arch // print error message if there are no JNI libs for this arch
`[ -n "$$jni_files" ] || (echo "ERROR: no JNI libs found for arch ${archString}" && exit 1) && ` + `[ -n "$$jni_files" ] || (echo "ERROR: no JNI libs found for arch ${archString}" && exit 1) && ` +
`${config.SoongZipCmd} -o $out -P 'lib/${archString}' ` + `${config.SoongZipCmd} -o $out -L 0 -P 'lib/${archString}' ` +
`-C $outDir/jni/${archString} $$(echo $$jni_files | xargs -n1 printf " -f %s")`, `-C $outDir/jni/${archString} $$(echo $$jni_files | xargs -n1 printf " -f %s")`,
CommandDeps: []string{"${config.SoongZipCmd}"}, CommandDeps: []string{"${config.SoongZipCmd}"},
}, },