diff options
| author | thaidn <thaidn@google.com> | 2021-05-19 00:16:42 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-05-19 00:17:14 -0700 |
| commit | 58be99b3c4d09154d12643327f293cc45b2a6a7b (patch) | |
| tree | 703cc82933ad84f92fab17ace61a4d49746b051a /java_src/tools | |
| parent | 8c08a8b6f9c83bc8171aaafc1bb1f69f231448db (diff) | |
| download | tink-58be99b3c4d09154d12643327f293cc45b2a6a7b.tar.gz | |
Add automatic module name to Tink's Maven jar.
This should fix https://github.com/google/tink/issues/473.
PiperOrigin-RevId: 374586642
Diffstat (limited to 'java_src/tools')
| -rw-r--r-- | java_src/tools/gen_maven_jar_rules.bzl | 7 | ||||
| -rw-r--r-- | java_src/tools/java_single_jar.bzl | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/java_src/tools/gen_maven_jar_rules.bzl b/java_src/tools/gen_maven_jar_rules.bzl index 60e4ab7a6..7706fb5c2 100644 --- a/java_src/tools/gen_maven_jar_rules.bzl +++ b/java_src/tools/gen_maven_jar_rules.bzl @@ -38,7 +38,8 @@ def gen_maven_jar_rules( doctitle = "", android_api_level = 23, bottom_text = "", - external_javadoc_links = _EXTERNAL_JAVADOC_LINKS): + external_javadoc_links = _EXTERNAL_JAVADOC_LINKS, + manifest_lines = []): """ Generates rules that generate Maven jars for a given package. @@ -60,6 +61,8 @@ def gen_maven_jar_rules( android_api_level: See javadoc_library bottom_text: See javadoc_library external_javadoc_links: See javadoc_library + manifest_lines: lines to put in the output manifest file (manifest + files in the input jars are ignored) """ if shaded_packages: @@ -69,6 +72,7 @@ def gen_maven_jar_rules( deps = deps, resources = resources, root_packages = root_packages + shaded_packages, + manifest_lines = manifest_lines, ) jar_jar( name = name, @@ -81,6 +85,7 @@ def gen_maven_jar_rules( deps = deps, resources = resources, root_packages = root_packages, + manifest_lines = manifest_lines, ) source_jar_name = name + "-src" diff --git a/java_src/tools/java_single_jar.bzl b/java_src/tools/java_single_jar.bzl index 502b91130..3c963e3d4 100644 --- a/java_src/tools/java_single_jar.bzl +++ b/java_src/tools/java_single_jar.bzl @@ -69,6 +69,9 @@ def _java_single_jar(ctx): if ctx.attr.exclude_build_data: args.add("--exclude_build_data") + if ctx.attr.manifest_lines: + args.add_all("--deploy_manifest_lines", ctx.attr.manifest_lines) + ctx.actions.run( inputs = inputs.to_list() + resource_files, outputs = [ctx.outputs.jar], @@ -95,6 +98,7 @@ java_single_jar = rule( "compress": attr.string(default = "preserve"), "root_packages": attr.string_list(), "exclude_build_data": attr.bool(default = True), + "manifest_lines": attr.string_list(), }, outputs = { "jar": "%{name}.jar", @@ -120,6 +124,8 @@ Args: root_packages: Java packages to include in generated jar. exclude_build_data: Whether to omit the build-data.properties file generated by default. + manifest_lines: lines to put in the output manifest file (manifest + files in the input jars are ignored) Outputs: {name}.jar: A single jar containing all of the input. |