Delete some more LIPO crumbs.

Closes #5478.

Change-Id: I3ac44605ef16a7c2e6bdc63d26fdf968bef651aa
PiperOrigin-RevId: 202482493

3 files changed, 3 insertions, 76 deletions

diff --git a/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm b/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm
index 31ff1f0271..95edd25995 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm
@@ -89,7 +89,7 @@ in your genrule's cmd attribute.
 <ul>
   <li class="harmful"> <code>CC</code>: The C and C++ compiler command. The built-in C++
     rules are much more sophisticated than "run the compiler on it". In order to
-    support compilation modes as diverse as *SAN, LIPO, ThinLTO, with/without
+    support compilation modes as diverse as *SAN, ThinLTO, with/without
     modules, and carefully optimized binaries at the same time as fast running
     tests on multiple platforms, the built-in rules go to great lengths to
     ensure the correct inputs, outputs, and command-line flags are set on each
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
index fda27a7f16..9254e3f9ac 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
@@ -128,8 +128,8 @@ public final class CcCompilationContext implements CcCompilationContextApi {
    * Builder#mergeDependentCcCompilationContexts(Iterable)}, they are consolidated into a single
    * middleman Artifact when {@link Builder#build()} is called.
    *
-   * <p>The returned set can be empty if there are no prerequisites. Usually it contains a single
-   * middleman, but if LIPO is used there can be two.
+   * <p>The returned set can be empty if there are no prerequisites. Usually, it contains a single
+   * middleman.
    */
   public ImmutableSet<Artifact> getTransitiveCompilationPrerequisites() {
     return compilationPrerequisites;
@@ -426,8 +426,6 @@ public final class CcCompilationContext implements CcCompilationContextApi {
      * headers.
      */
     public Builder addCompilationPrerequisites(Iterable<Artifact> prerequisites) {
-      // LIPO collector must not add compilation prerequisites in order to avoid
-      // the creation of a middleman action.
       for (Artifact prerequisite : prerequisites) {
         String basename = prerequisite.getFilename();
         Preconditions.checkArgument(!Link.OBJECT_FILETYPES.matches(basename));
@@ -793,22 +791,6 @@ public final class CcCompilationContext implements CcCompilationContextApi {
       }
 
       /**
-       * Merges a {@link ModuleInfo} into this one. In contrast to addTransitive, this doesn't add
-       * the dependent module to transitiveModules, but just merges the transitive sets. The main
-       * usage is to merge multiple {@link ModuleInfo} instances for Lipo.
-       */
-      public Builder merge(ModuleInfo other) {
-        if (headerModule == null) {
-          headerModule = other.headerModule;
-        }
-        modularHeaders.addAll(other.modularHeaders);
-        textualHeaders.addAll(other.textualHeaders);
-        transitiveModules.addTransitive(other.transitiveModules);
-        transitiveModuleHeaders.addTransitive(other.transitiveModuleHeaders);
-        return this;
-      }
-
-      /**
        * Adds the {@link ModuleInfo} of a dependency and builds up the transitive data structures.
        */
       public Builder addTransitive(ModuleInfo moduleInfo) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java
deleted file mode 100644
index e07ce2e95f..0000000000
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.rules.cpp;
-
-import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.collect.nestedset.NestedSet;
-import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-
-/**
- * A target that can contribute profiling information to LIPO C++ compilations.
- *
- * <p>This is used in the LIPO context collector tree to collect data from the transitive closure of
- * the :lipo_context_collector target. It is eventually passed to the configured targets in the
- * target configuration through {@link LipoContextProvider}.
- */
-@Immutable
-@AutoCodec
-public final class TransitiveLipoInfoProvider implements TransitiveInfoProvider {
-  public static final String LIPO_CONTEXT_COLLECTOR = ":lipo_context_collector";
-  public static final TransitiveLipoInfoProvider EMPTY =
-      new TransitiveLipoInfoProvider(
-          NestedSetBuilder.<IncludeScannable>emptySet(Order.STABLE_ORDER));
-
-  private final NestedSet<IncludeScannable> includeScannables;
-
-  @AutoCodec.Instantiator
-  public TransitiveLipoInfoProvider(NestedSet<IncludeScannable> includeScannables) {
-    this.includeScannables = includeScannables;
-  }
-
-  /**
-   * Returns the include scannables in the transitive closure.
-   *
-   * <p>This is used for constructing the path fragment -> include scannable map in the
-   * LIPO-enabled target configuration.
-   */
-  public NestedSet<IncludeScannable> getTransitiveIncludeScannables() {
-    return includeScannables;
-  }
-}