fix cases where builtin py info is none

Author: rickeylev

python/private/common/py_executable.bzl

@@ -890,7 +890,8 @@ def _create_providers(
         )
 
     providers.append(py_info)
-    providers.append(builtin_py_info)
+    if builtin_py_info:
+        providers.append(builtin_py_info)
     providers.append(create_output_group_info(py_info.transitive_sources, output_groups))
 
     extra_providers = semantics.get_extra_providers(

python/private/common/py_library.bzl

@@ -98,14 +98,16 @@ def py_library_impl(ctx, *, semantics):
             dependency_transitive_python_sources = deps_transitive_sources,
         )
 
-    return [
+    providers = [
         DefaultInfo(files = default_outputs, runfiles = runfiles),
         py_info,
-        builtins_py_info,
         create_instrumented_files_info(ctx),
         PyCcLinkParamsProvider(cc_info = cc_info),
         create_output_group_info(py_info.transitive_sources, extra_groups = {}),
     ]
+    if builtins_py_info:
+        providers.append(builtins_py_info)
+    return providers
 
 _DEFAULT_PY_LIBRARY_DOC = """
 A library of Python code that can be depended upon.

python/private/py_info.bzl

@@ -229,6 +229,9 @@ def _PyInfoBuilder_build(self):
     )
 
 def _PyInfoBuilder_build_builtin_py_info(self):
+    if BuiltinPyInfo == None:
+        return None
+
     return BuiltinPyInfo(
         has_py2_only_sources = self._has_py2_only_sources[0],
         has_py3_only_sources = self._has_py3_only_sources[0],

tests/base_rules/py_info/py_info_tests.bzl

@@ -179,7 +179,8 @@ def _test_py_info_builder_impl(env, targets):
             ])
 
     check(builder.build())
-    check(builder.build_builtin_py_info())
+    if BuiltinPyInfo != None:
+        check(builder.build_builtin_py_info())
 
     builder.set_has_py2_only_sources(False)
     builder.set_has_py3_only_sources(False)