Make merge_zips -stripFile use blueprint style globs
merge_zips -stripFile was only considering the name of the file and
ignoring the path. Make it more useful by supporting blueprint style
globs. The previous behavior can be recreated by prefixing with **/.
Bug: 111389216
Test: m checkbuild
Change-Id: I25760fe3f1f77704dd9da9d107d9a38a415d681f
diff --git a/java/java.go b/java/java.go
index 5cbd8ba..89aa0e1 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1032,7 +1032,9 @@
if Bool(j.properties.Renamed_kotlin_stdlib) {
// Remove any kotlin-reflect related files
// TODO(pszczepaniak): Support kotlin-reflect
- stripFiles = append(stripFiles, "*.kotlin_module", "*.kotlin_builtin")
+ stripFiles = append(stripFiles,
+ "**/*.kotlin_module",
+ "**/*.kotlin_builtin")
} else {
// Only add kotlin-stdlib if not using (on-device) renamed stdlib
// (it's expected to be on device bootclasspath)