From bd4496b5ef88e655d6e63a80fb0428f55f476366 Mon Sep 17 00:00:00 2001
From: Zi Wang <mrziwang@google.com>
Date: Thu, 7 Sep 2023 11:55:38 -0700
Subject: [PATCH 1/2] Add handcrafted libprotobuf-java-full

Test: CI

Bug: 299290824
Change-Id: I243acbb8b4ad9ae5d498aaa1558f81beeb668693
---
 BUILD.bazel | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/BUILD.bazel b/BUILD.bazel
index 8a9ebf78b8..5f7c4e519e 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -16,6 +16,7 @@
 # from Android.bp. The BUILD file in this folder is unused, it's from
 # the protocol-buffers github repo.
 load("//build/bazel/rules/python:py_proto.bzl", "py_proto_library")
+load("//build/bazel/rules/java:proto.bzl", "java_proto_sources_gen")
 
 py_library(
     name = "libprotobuf-python",
@@ -60,3 +61,18 @@ proto_library(
     srcs = ["src/" + f + ".proto" for f in proto_filenames],
     strip_import_prefix = "src",
 )
+
+java_library(
+    name = "libprotobuf-java-full",
+    java_version = "1.7",
+    srcs = glob(["java/core/src/main/java/**/*.java"]) + [":libprotobuf-java-full_proto_gen"],
+    target_compatible_with = select({
+        "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
+)
+
+java_proto_sources_gen(
+    name = "libprotobuf-java-full_proto_gen",
+    deps = [":libprotobuf-internal-protos_proto"],
+)

From 87050d55e3412b2f7968f35906e4f9eeabaaca5f Mon Sep 17 00:00:00 2001
From: Zi Wang <mrziwang@google.com>
Date: Thu, 7 Sep 2023 15:43:08 -0700
Subject: [PATCH 2/2] Add filegroup for libprotobuf-java-full java srcs

so that we can stop using glob, which causes error when building it.

Test: CI

Bug: 299290824
Change-Id: I713b8fbfa8498c6ed5c8791c88549269bc325eba
---
 Android.bp  |  6 ++++++
 BUILD.bazel | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index ab335caf6d..e4e3b2894a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -706,6 +706,12 @@ filegroup {
     path: "python",
 }
 
+filegroup {
+    name: "libprotobuf-internal-java-full-srcs",
+    srcs: ["java/core/src/main/java/**/*.java"],
+    path: "java",
+}
+
 filegroup {
     name: "libprotobuf-internal-protos",
     srcs: [
diff --git a/BUILD.bazel b/BUILD.bazel
index 5f7c4e519e..10f2a5d7c6 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -65,7 +65,21 @@ proto_library(
 java_library(
     name = "libprotobuf-java-full",
     java_version = "1.7",
-    srcs = glob(["java/core/src/main/java/**/*.java"]) + [":libprotobuf-java-full_proto_gen"],
+    srcs = [
+        ":libprotobuf-internal-java-full-srcs",
+        ":libprotobuf-java-full_proto_gen",
+    ],
+    target_compatible_with = select({
+        "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
+)
+
+java_library(
+    name = "libprotobuf-java-full-neverlink",
+    exports = [":libprotobuf-java-full"],
+    java_version = "1.7",
+    neverlink = True,
     target_compatible_with = select({
         "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
         "//conditions:default": [],