diff options
| author | 2023-07-24 14:27:25 +0000 | |
|---|---|---|
| committer | 2023-07-24 14:27:25 +0000 | |
| commit | ed89d33fb12da2b7e1341f7442b76f06e4d866ef (patch) | |
| tree | b4561325ce669fc2c59e6addedaac74afa7dec18 /java/builder.go | |
| parent | 1c535124d5c7a04a7dc449db1686e4f9de5e30c2 (diff) | |
| parent | 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87 (diff) | |
Merge changes I69f80d12,I40d48644 into main
* changes:
Merge META-INF/services/* files in merge_zips -jar
Strip META-INF/services from implementation jars when using as header jars
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/java/builder.go b/java/builder.go index 94a6b84b8..afbd69ee4 100644 --- a/java/builder.go +++ b/java/builder.go @@ -271,6 +271,12 @@ var ( Description: "Check zip alignment", }, ) + + convertImplementationJarToHeaderJarRule = pctx.AndroidStaticRule("convertImplementationJarToHeaderJar", + blueprint.RuleParams{ + Command: `${config.Zip2ZipCmd} -i ${in} -o ${out} -x 'META-INF/services/**/*'`, + CommandDeps: []string{"${config.Zip2ZipCmd}"}, + }) ) func init() { @@ -633,6 +639,15 @@ func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePa }) } +func convertImplementationJarToHeaderJar(ctx android.ModuleContext, implementationJarFile android.Path, + headerJarFile android.WritablePath) { + ctx.Build(pctx, android.BuildParams{ + Rule: convertImplementationJarToHeaderJarRule, + Input: implementationJarFile, + Output: headerJarFile, + }) +} + func TransformJarJar(ctx android.ModuleContext, outputFile android.WritablePath, classesJar android.Path, rulesFile android.Path) { ctx.Build(pctx, android.BuildParams{ |