diff options
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index 81b0feb75..e5d510923 100644 --- a/java/builder.go +++ b/java/builder.go @@ -260,10 +260,10 @@ var ( ravenizer = pctx.AndroidStaticRule("ravenizer", blueprint.RuleParams{ - Command: "rm -f $out && ${ravenizer} --in-jar $in --out-jar $out", + Command: "rm -f $out && ${ravenizer} --in-jar $in --out-jar $out $ravenizerArgs", CommandDeps: []string{"${ravenizer}"}, }, - ) + "ravenizerArgs") apimapper = pctx.AndroidStaticRule("apimapper", blueprint.RuleParams{ @@ -703,6 +703,7 @@ func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePa // 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") + jarArgs = append(jarArgs, "-stripFile META-INF/versions/*/module-info.class") if stripDirEntries { jarArgs = append(jarArgs, "-D") @@ -782,12 +783,15 @@ func TransformJetifier(ctx android.ModuleContext, outputFile android.WritablePat } func TransformRavenizer(ctx android.ModuleContext, outputFile android.WritablePath, - inputFile android.Path) { + inputFile android.Path, ravenizerArgs string) { ctx.Build(pctx, android.BuildParams{ Rule: ravenizer, Description: "ravenizer", Output: outputFile, Input: inputFile, + Args: map[string]string{ + "ravenizerArgs": ravenizerArgs, + }, }) } |