Export Java proto libraries by default

comius · copybara-github · commit c945c1610162 · 2022-06-10T04:11:55.000-07:00
Downstream tests: https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2494 PiperOrigin-RevId: 454132022 Change-Id: If82d45f4746730569afbaac63cf75938c8906eaa
diff --git 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
@@ -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
@@ -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$')"

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ exported_toplevels = {}`
`22`	`22`	`exported_rules = {`
`23`	`23`	`"java_library": java_library,`
`24`	`24`	`"java_plugin": java_plugin,`
`25`		`- "-java_proto_library": java_proto_library,`
	`25`	`+ "+java_proto_library": java_proto_library,`
`26`	`26`	`}`
`27`	`27`	`exported_to_java = {}`