protocolbuffers
diff --git a/‎bazel/common/proto_common.bzl
Copy file name to clipboardExpand all lines: bazel/common/proto_common.bzl
+1-1 b/‎bazel/common/proto_common.bzl
Copy file name to clipboardExpand all lines: bazel/common/proto_common.bzl
+1-1
diff --git a/‎bazel/private/proto_info.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_info.bzl
-26 b/‎bazel/private/proto_info.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_info.bzl
-26
diff --git a/‎bazel/private/proto_lang_toolchain_rule.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_lang_toolchain_rule.bzl
+1-1 b/‎bazel/private/proto_lang_toolchain_rule.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_lang_toolchain_rule.bzl
+1-1
diff --git a/‎bazel/private/proto_library_rule.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_library_rule.bzl
+3-3 b/‎bazel/private/proto_library_rule.bzl
Copy file name to clipboardExpand all lines: bazel/private/proto_library_rule.bzl
+3-3
@@ -246,7 +246,7 @@ def _experimental_filter_sources(proto_info, proto_lang_toolchain_info):
             provided_paths[path] = None
 
     # Filter proto files
-    proto_files = proto_info._direct_proto_sources
+    proto_files = proto_info.direct_sources
     excluded = []
     included = []
     for proto_file in proto_files:
 
@@ -9,9 +9,6 @@
 Definition of ProtoInfo provider.
 """
 
-_warning = """ Don't use this field. It's intended for internal use and will be changed or removed
-    without warning."""
-
 def _uniq(iterable):
     unique_elements = {element: None for element in iterable}
     return list(unique_elements.keys())
@@ -74,12 +71,6 @@ def _create_proto_info(*, srcs, deps, descriptor_set, proto_path = "", workspace
         if not bin_dir:
             fail("bin_dir parameter should be set when _virtual_imports are used")
 
-    direct_proto_sources = srcs
-    transitive_proto_sources = depset(
-        direct = direct_proto_sources,
-        transitive = [dep._transitive_proto_sources for dep in deps],
-        order = "preorder",
-    )
     transitive_sources = depset(
         direct = srcs,
         transitive = [dep.transitive_sources for dep in deps],
@@ -104,12 +95,6 @@ def _create_proto_info(*, srcs, deps, descriptor_set, proto_path = "", workspace
         transitive = [dep.transitive_descriptor_sets for dep in deps],
     )
 
-    # Layering checks.
-    if srcs:
-        exported_sources = depset(direct = direct_proto_sources)
-    else:
-        exported_sources = depset(transitive = [dep._exported_sources for dep in deps])
-
     if "_virtual_imports/" in proto_path:
         #TODO: remove bin_dir from proto_source_root (when users assuming it's there are migrated)
         proto_source_root = _empty_to_dot(_from_root(bin_dir, workspace_root, proto_path))
@@ -127,9 +112,6 @@ def _create_proto_info(*, srcs, deps, descriptor_set, proto_path = "", workspace
         transitive_proto_path = transitive_proto_path,
         check_deps_sources = check_deps_sources,
         transitive_imports = transitive_sources,
-        _direct_proto_sources = direct_proto_sources,
-        _transitive_proto_sources = transitive_proto_sources,
-        _exported_sources = exported_sources,
     )
     if allow_exports:
         proto_info["allow_exports"] = allow_exports
@@ -173,14 +155,6 @@ ProtoInfo, _ = provider(
 
         # Deprecated fields:
         "transitive_imports": """(depset[File]) Deprecated: use `transitive_sources` instead.""",
-
-        # Internal fields:
-        "_direct_proto_sources": """(list[File]) The `ProtoSourceInfo`s from the `srcs`
-            attribute.""" + _warning,
-        "_transitive_proto_sources": """(depset[File]) The `ProtoSourceInfo`s from this
-            rule and all its dependent protocol buffer rules.""" + _warning,
-        "_exported_sources": """(depset[File]) A set of `ProtoSourceInfo`s that may be
-            imported by another `proto_library` depending on this one.""" + _warning,
     },
     init = _create_proto_info,
 )
@@ -14,7 +14,7 @@ load("//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
 load("//bazel/private:toolchain_helpers.bzl", "toolchains")
 
 def _rule_impl(ctx):
-    provided_proto_sources = depset(transitive = [bp[ProtoInfo]._transitive_proto_sources for bp in ctx.attr.blacklisted_protos]).to_list()
+    provided_proto_sources = depset(transitive = [bp[ProtoInfo].transitive_sources for bp in ctx.attr.blacklisted_protos]).to_list()
 
     flag = ctx.attr.command_line
     if flag.find("$(PLUGIN_OUT)") > -1:
 
@@ -172,8 +172,8 @@ def _write_descriptor_set(ctx, proto_info, deps, exports, descriptor_set):
     if strict_deps:
         if proto_info.direct_sources:
             strict_importable_sources = depset(
-                direct = proto_info._direct_proto_sources,
-                transitive = [dep._exported_sources for dep in deps],
+                direct = proto_info.direct_sources,
+                transitive = [dep.check_deps_sources for dep in deps],
             )
         else:
             strict_importable_sources = None
@@ -195,7 +195,7 @@ def _write_descriptor_set(ctx, proto_info, deps, exports, descriptor_set):
 
     strict_imports = ctx.attr._strict_public_imports[BuildSettingInfo].value
     if strict_imports:
-        public_import_protos = depset(transitive = [export._exported_sources for export in exports])
+        public_import_protos = depset(transitive = [export.check_deps_sources for export in exports])
         if not public_import_protos:
             # This line is necessary to trigger the check.
             args.add("--allowed_public_imports=")