Internal change

PiperOrigin-RevId: 626394936
Change-Id: I2a66283f46551f1674eb2b48c9cf4403e74446c2
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java
index 4a5cbf1..f05d4c6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java
@@ -43,6 +43,7 @@
         CcInfo.builder()
             .setCcLinkingContext(ccInfo.getCcLinkingContext())
             .setCcNativeLibraryInfo(ccInfo.getCcNativeLibraryInfo())
+            .setCcDebugInfoContext(ccInfo.getCcDebugInfoContext())
             .build());
   }
 
diff --git a/src/main/starlark/builtins_bzl/common/java/java_info.bzl b/src/main/starlark/builtins_bzl/common/java/java_info.bzl
index 605bbbd..14057f5 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_info.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_info.bzl
@@ -502,6 +502,7 @@
     return CcInfo(
         linking_context = cc_info.linking_context,
         cc_native_library_info = CcNativeLibraryInfo(libraries_to_link = cc_info.transitive_native_libraries()),
+        debug_context = cc_info.debug_context(),
     )
 
 def _compute_concatenated_deps(deps, runtime_deps, exports):