Revert "Add automatic module name to Tink's Maven jar."
This reverts commit 7bb05e70d07d509d85f6581be36e138d7b325dff.
This change will be saved for inclusion in 1.7.0.
diff --git a/apps/paymentmethodtoken/BUILD.bazel b/apps/paymentmethodtoken/BUILD.bazel
index f601945..6cc83f0 100644
--- a/apps/paymentmethodtoken/BUILD.bazel
+++ b/apps/paymentmethodtoken/BUILD.bazel
@@ -7,9 +7,6 @@
gen_maven_jar_rules(
name = "maven",
doctitle = "Tink Cryptography API for Google Payment Method Token",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink.apps.paymentmethodtoken",
- ],
root_packages = ["com.google.crypto.tink.apps.paymentmethodtoken"],
deps = [
"//paymentmethodtoken/src/main/java/com/google/crypto/tink/apps/paymentmethodtoken:google_payments_public_keys_manager",
diff --git a/apps/rewardedads/BUILD.bazel b/apps/rewardedads/BUILD.bazel
index a8f1330..6efa5c9 100644
--- a/apps/rewardedads/BUILD.bazel
+++ b/apps/rewardedads/BUILD.bazel
@@ -7,9 +7,6 @@
gen_maven_jar_rules(
name = "maven",
doctitle = "Tink Cryptography API for Google Mobile Rewarded Video Ads SSV",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink.apps.rewardedads",
- ],
root_packages = ["com.google.crypto.tink.apps.rewardedads"],
deps = ["//rewardedads/src/main/java/com/google/crypto/tink/apps/rewardedads:rewarded_ads_verifier"],
)
diff --git a/apps/webpush/BUILD.bazel b/apps/webpush/BUILD.bazel
index 7260048..8055fad 100644
--- a/apps/webpush/BUILD.bazel
+++ b/apps/webpush/BUILD.bazel
@@ -7,9 +7,6 @@
gen_maven_jar_rules(
name = "maven",
doctitle = "Tink Cryptography API for Message Encryption for Web Push (RFC 8291)",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink.apps.webpush",
- ],
root_packages = ["com.google.crypto.tink.apps.webpush"],
deps = [
"//webpush/src/main/java/com/google/crypto/tink/apps/webpush:web_push_constants",
diff --git a/java_src/BUILD.bazel b/java_src/BUILD.bazel
index 8418e50..427fcce 100644
--- a/java_src/BUILD.bazel
+++ b/java_src/BUILD.bazel
@@ -13,9 +13,6 @@
gen_maven_jar_rules(
name = "tink",
doctitle = "Tink Cryptography API",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink",
- ],
root_packages = [
"com.google.crypto.tink",
],
@@ -351,9 +348,6 @@
gen_maven_jar_rules(
name = "tink-awskms",
doctitle = "Tink Cryptography API with AWS KMS",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink.integration.awskms",
- ],
root_packages = [
"com.google.crypto.tink",
],
@@ -366,9 +360,6 @@
gen_maven_jar_rules(
name = "tink-gcpkms",
doctitle = "Tink Cryptography API with Google Cloud KMS",
- manifest_lines = [
- "Automatic-Module-Name: com.google.crypto.tink.integration.gcpkms",
- ],
root_packages = [
"com.google.crypto.tink",
],
diff --git a/java_src/tools/gen_maven_jar_rules.bzl b/java_src/tools/gen_maven_jar_rules.bzl
index 7706fb5..60e4ab7 100644
--- a/java_src/tools/gen_maven_jar_rules.bzl
+++ b/java_src/tools/gen_maven_jar_rules.bzl
@@ -38,8 +38,7 @@
doctitle = "",
android_api_level = 23,
bottom_text = "",
- external_javadoc_links = _EXTERNAL_JAVADOC_LINKS,
- manifest_lines = []):
+ external_javadoc_links = _EXTERNAL_JAVADOC_LINKS):
"""
Generates rules that generate Maven jars for a given package.
@@ -61,8 +60,6 @@
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:
@@ -72,7 +69,6 @@
deps = deps,
resources = resources,
root_packages = root_packages + shaded_packages,
- manifest_lines = manifest_lines,
)
jar_jar(
name = name,
@@ -85,7 +81,6 @@
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 80c89b6..502b911 100644
--- a/java_src/tools/java_single_jar.bzl
+++ b/java_src/tools/java_single_jar.bzl
@@ -69,8 +69,6 @@
if ctx.attr.exclude_build_data:
args.add("--exclude_build_data")
- args.add_all("--deploy_manifest_lines", ctx.attr.manifest_lines, format_each = "\"%s\"")
-
ctx.actions.run(
inputs = inputs.to_list() + resource_files,
outputs = [ctx.outputs.jar],
@@ -97,7 +95,6 @@
"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",
@@ -123,8 +120,6 @@
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.
