Internal change

PiperOrigin-RevId: 970944472

bazel/java_lite_proto_library.bzl

@@ -7,6 +7,11 @@
 
 """java_lite_proto_library rule"""
 
-load("//bazel/private:java_lite_proto_library.bzl", _java_lite_proto_library = "java_lite_proto_library")
+load(
+    "//bazel/private:java_lite_proto_library.bzl",
+    _java_lite_proto_aspect = "java_lite_proto_aspect",
+    _java_lite_proto_library = "java_lite_proto_library",
+)
 
 java_lite_proto_library = _java_lite_proto_library
+java_lite_proto_aspect = _java_lite_proto_aspect

bazel/java_proto_library.bzl

@@ -7,6 +7,11 @@
 
 """java_proto_library rule."""
 
-load("//bazel/private:java_proto_library.bzl", _java_proto_library = "java_proto_library")
+load(
+    "//bazel/private:java_proto_library.bzl",
+    _bazel_java_proto_aspect = "bazel_java_proto_aspect",
+    _java_proto_library = "java_proto_library",
+)
 
 java_proto_library = _java_proto_library
+bazel_java_proto_aspect = _bazel_java_proto_aspect

bazel/private/java_lite_proto_library.bzl

@@ -61,7 +61,7 @@ def _aspect_impl(target, ctx):
     transitive_jars = [dep[JavaProtoAspectInfo].jars for dep in ctx.rule.attr.deps]
 
     return [
-        java_info,
+        add_constraints(java_info, constraints = ["android"]),
         JavaProtoAspectInfo(jars = depset(jars, transitive = transitive_jars)),
     ]
 

java/kotlin/src/test/kotlin/com/google/protobuf/diamond/DiamondDependencyTest.kt

@@ -0,0 +1,26 @@
+package com.google.protobuf.kotlin.diamond
+
+import kotlin.test.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/**
+ * Regression test for Bazel Java One-Version classpath collisions in Kotlin proto generation.
+ *
+ * Verifies that when a test depends simultaneously on a leaf Kotlin proto library
+ * (`:leaf_kt_proto`) and an exporter Kotlin proto library (`:exporter_kt_proto`, which re-exports
+ * `:leaf_proto`), the Kotlin proto code generation does not duplicate class definitions with
+ * differing Cyclic Redundancy Checks (CRCs) across multiple jars on the runtime classpath.
+ */
+@RunWith(JUnit4::class)
+class DiamondDependencyTest {
+  @Test
+  fun testDiamondDependencyClasspath() {
+    val leaf = leafMessage { value = "leaf" }
+    assertEquals("leaf", leaf.value)
+
+    val exporter = exporterMessage { value = "exporter" }
+    assertEquals("exporter", exporter.value)
+  }
+}

java/kotlin/src/test/proto/com/google/protobuf/diamond/exporter.proto

@@ -0,0 +1,9 @@
+edition = "2024";
+
+package protobuf.kotlin.test.diamond;
+
+option java_package = "com.google.protobuf.kotlin.diamond";
+
+message ExporterMessage {
+  string value = 1;
+}

java/kotlin/src/test/proto/com/google/protobuf/diamond/leaf.proto

@@ -0,0 +1,9 @@
+edition = "2024";
+
+package protobuf.kotlin.test.diamond;
+
+option java_package = "com.google.protobuf.kotlin.diamond";
+
+message LeafMessage {
+  string value = 1;
+}