commit f8242d07f69f4bdc1cedbf3ffb0887e5ddc119f1
author ilist <ilist@google.com> Fri May 07 02:44:14 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri May 07 02:45:15 2021 -0700
tree 6a2e6c4002ffcf7cca68067f96a9d1623224470a
parent 309f4e1475efc08b20e406038d10eb30090fca82

Remove inessential data from CcInfo when constructing JavaCcInfoProvider.

Removing everything, but linking context and native library info. Those are the only data that is needed down the stream.

PiperOrigin-RevId: 372517651

src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java

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 a384e13..626b399 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
@@ -37,19 +37,17 @@
 
   @AutoCodec.VisibleForSerialization
   public JavaCcInfoProvider(CcInfo ccInfo) {
-    this.ccInfo = ccInfo;
+    this.ccInfo =
+        CcInfo.builder()
+            .setCcLinkingContext(ccInfo.getCcLinkingContext())
+            .setCcNativeLibraryInfo(ccInfo.getCcNativeLibraryInfo())
+            .build();
   }
 
   /** Merges several JavaCcInfoProvider providers into one. */
   public static JavaCcInfoProvider merge(Collection<JavaCcInfoProvider> providers) {
     ImmutableList<CcInfo> ccInfos =
         providers.stream().map(JavaCcInfoProvider::getCcInfo).collect(toImmutableList());
-    CcInfo mergedCcInfo = CcInfo.merge(ccInfos);
-    CcInfo filteredCcInfo =
-        CcInfo.builder()
-            .setCcLinkingContext(mergedCcInfo.getCcLinkingContext())
-            .setCcNativeLibraryInfo(mergedCcInfo.getCcNativeLibraryInfo())
-            .build();
-    return new JavaCcInfoProvider(filteredCcInfo);
+    return new JavaCcInfoProvider(CcInfo.merge(ccInfos));
   }
 }