From 80ee45ccc9d335e5e8386b387ee76c424643cbaa Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Thu, 22 Jun 2023 15:36:02 -0400 Subject: [PATCH] don't compress JNI libs extracted from aar_import APKs expect JNI libs in the libs folder to be stored uncompressed, so we should not compress libs that we extract from the AAR. Bug: 280339573 Test: m AiWallpapers before this change && compare to AiWallpapers with ag/22948656 Change-Id: I63baa3763bc01c74d8df9b0b3e035ea50c31904c --- java/aar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/aar.go b/java/aar.go index 29e86e678..7a189cec1 100644 --- a/java/aar.go +++ b/java/aar.go @@ -810,7 +810,7 @@ var extractJNI = pctx.AndroidStaticRule("extractJNI", `jni_files=$$(find $outDir/jni -type f) && ` + // 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) && ` + - `${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")`, CommandDeps: []string{"${config.SoongZipCmd}"}, },