diff options
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/java/builder.go b/java/builder.go index 15e963136..55be3a6b5 100644 --- a/java/builder.go +++ b/java/builder.go @@ -318,7 +318,8 @@ func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.Writa } func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePath, desc string, - jars android.Paths, manifest android.OptionalPath, stripDirs bool, dirsToStrip []string) { + jars android.Paths, manifest android.OptionalPath, stripDirEntries bool, filesToStrip []string, + dirsToStrip []string) { var deps android.Paths @@ -328,22 +329,19 @@ func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePa deps = append(deps, manifest.Path()) } - if dirsToStrip != nil { - for _, dir := range dirsToStrip { - jarArgs = append(jarArgs, "-stripDir ", dir) - } + for _, dir := range dirsToStrip { + jarArgs = append(jarArgs, "-stripDir ", dir) + } + + for _, file := range filesToStrip { + jarArgs = append(jarArgs, "-stripFile ", file) } // Remove any module-info.class files that may have come from prebuilt jars, they cause problems // for downstream tools like desugar. jarArgs = append(jarArgs, "-stripFile module-info.class") - // Remove any kotlin-reflect related files - // TODO(pszczepaniak): Support kotlin-reflect - jarArgs = append(jarArgs, "-stripFile \"*.kotlin_module\"") - jarArgs = append(jarArgs, "-stripFile \"*.kotlin_builtin\"") - - if stripDirs { + if stripDirEntries { jarArgs = append(jarArgs, "-D") } |