C++: Refactors CLIF rule to go through CcLibraryHelper.

TBD: finish pulling out CLIF logic from the C++ rules implementation. This involves refactoring ArtifactCategory and CppSource.Type.

CLIF does PIC compilation now. This detail should be irrelevant to users since CLIF only cares about the matched protobuf output file.

SKIP_KOKORO=flakes

RELNOTES:none
PiperOrigin-RevId: 183396902

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 77aa67593e..dd66496263 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -745,12 +745,16 @@ public class CppHelper {
    * or null if such a provider doesn't exist.
    */
   public static LipoContextProvider getLipoContextProvider(RuleContext ruleContext) {
-    if (ruleContext.getRule().getAttributeDefinition(":lipo_context_collector") == null) {
+    if (ruleContext
+            .getRule()
+            .getAttributeDefinition(TransitiveLipoInfoProvider.LIPO_CONTEXT_COLLECTOR)
+        == null) {
       return null;
     }
 
     TransitiveInfoCollection dep =
-        ruleContext.getPrerequisite(":lipo_context_collector", Mode.DONT_CHECK);
+        ruleContext.getPrerequisite(
+            TransitiveLipoInfoProvider.LIPO_CONTEXT_COLLECTOR, Mode.DONT_CHECK);
     return (dep != null) ? dep.getProvider(LipoContextProvider.class) : null;
   }