From c945c161016235397c8954516a0f1a9660bbcf83 Mon Sep 17 00:00:00 2001
From: Googler <ilist@google.com>
Date: Fri, 10 Jun 2022 04:10:17 -0700
Subject: [PATCH] Export Java proto libraries by default

Downstream tests: https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2494

PiperOrigin-RevId: 454132022
Change-Id: If82d45f4746730569afbaac63cf75938c8906eaa
---
 src/main/starlark/builtins_bzl/bazel/exports.bzl       | 2 +-
 src/main/starlark/builtins_bzl/common/exports.bzl      | 2 +-
 src/test/shell/integration/discard_graph_edges_test.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/starlark/builtins_bzl/bazel/exports.bzl b/src/main/starlark/builtins_bzl/bazel/exports.bzl
index aceae7f8b11f63..e2d7ecae58a436 100644
--- a/src/main/starlark/builtins_bzl/bazel/exports.bzl
+++ b/src/main/starlark/builtins_bzl/bazel/exports.bzl
@@ -22,6 +22,6 @@ exported_toplevels = {}
 exported_rules = {
     "java_library": java_library,
     "java_plugin": java_plugin,
-    "-java_proto_library": java_proto_library,
+    "+java_proto_library": java_proto_library,
 }
 exported_to_java = {}
diff --git a/src/main/starlark/builtins_bzl/common/exports.bzl b/src/main/starlark/builtins_bzl/common/exports.bzl
index 54fcfc2a972b01..2ae635098b70c1 100755
--- a/src/main/starlark/builtins_bzl/common/exports.bzl
+++ b/src/main/starlark/builtins_bzl/common/exports.bzl
@@ -45,7 +45,7 @@ exported_toplevels = {
 # * leading `-` means the Starlark rule exists, but is not used by default
 exported_rules = {
     "+cc_import": cc_import,
-    "-java_lite_proto_library": java_lite_proto_library,
+    "+java_lite_proto_library": java_lite_proto_library,
     "objc_import": objc_import,
     "objc_library": objc_library,
     "+proto_library": proto_library,
diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index 9c814d543f4327..4e27e77a1ba64d 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -276,7 +276,7 @@ function test_packages_cleared() {
   [[ "$glob_count" -le 1 ]] \
       || fail "glob count $glob_count too high"
   module_count="$(extract_histogram_count "$histo_file" 'eval.Module$')"
-  [[ "$module_count" -lt 100 ]] \
+  [[ "$module_count" -lt 120 ]] \
       || fail "Module count $module_count too high"
   ct_count="$(extract_histogram_count "$histo_file" \
        'RuleConfiguredTarget$')"