commit 716fc3438bce5e2018b47cf906195b4f9aecea5c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 21 16:27:08 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 21 16:27:08 2025 -0700
tree 2789f57ad33c7bf8a28df9ded872139adcf05ac7
parent 8799136fceb772e45322b7ab99666abc84988eac
parent f4183ce252db8263f16c06fb54bd95686be95384

Merge "Quote zip2zip arg with a *." into main am: f4183ce252

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

Change-Id: If1734fdda905a08045f291f0f1ec7ac5c51de982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

java/app_import.go

diff --git a/java/app_import.go b/java/app_import.go
index c0e8171..9fb13ba 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -338,7 +338,7 @@
 	for _, target := range ctx.MultiTargets() {
 		supported_abis := target.Arch.Abi
 		for _, arch := range supported_abis {
-			wantedJniLibSlice = append(wantedJniLibSlice, " -X lib/"+arch+"/*.so")
+			wantedJniLibSlice = append(wantedJniLibSlice, " -X 'lib/"+arch+"/*.so'")
 		}
 	}
 	wantedJniLibString := strings.Join(wantedJniLibSlice, " ")