Ban middlemen from runfiles artifacts.

Previous changes have removed all middlemen from runfiles
artifacts. This CL locks it down and removes various now-redundant
*WithoutMiddlemen() methods from Runfiles.

I put a check for middlemen in ConflictChecker.put, which should be a
chokepoint for runfiles artifacts. It's unfortunate we can't detect
middlemen earlier than execution, but I can't see a way to efficiently
check every runfiles artifact earlier.

Change-Id: I57fcb51b02e40adf3ebc4591c26bf5492c89352f
PiperOrigin-RevId: 175206157

2 files changed, 1 insertions, 14 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java
index e54ddc3e25..ec6852eacc 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java
@@ -17,7 +17,6 @@ package com.google.devtools.build.lib.analysis;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
@@ -58,18 +57,6 @@ public class RunfilesSupplierImplTest {
   }
 
   @Test
-  public void testGetArtifactsFilterMiddlemen() {
-    List<Artifact> artifacts = mkArtifacts(rootDir, "thing1", "thing2");
-    Artifact middleman = new Artifact(PathFragment.create("middleman"), middlemanRoot);
-    Runfiles runfiles = mkRunfiles(Iterables.concat(artifacts, ImmutableList.of(middleman)));
-
-    RunfilesSupplier underTest =
-        new RunfilesSupplierImpl(PathFragment.create("notimportant"), runfiles);
-
-    assertThat(underTest.getArtifacts()).containsExactlyElementsIn(artifacts);
-  }
-
-  @Test
   public void testGetManifestsWhenNone() {
     RunfilesSupplier underTest =
         new RunfilesSupplierImpl(PathFragment.create("ignored"), Runfiles.EMPTY, null);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
index 55718d40ee..aefd956513 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
@@ -65,7 +65,7 @@ public class AndroidHostServiceFixtureTest extends AndroidBuildViewTestCase {
                 hostServiceFixture
                     .getProvider(RunfilesProvider.class)
                     .getDefaultRunfiles()
-                    .getArtifactsWithoutMiddlemen()))
+                    .getArtifacts()))
         .containsExactlyElementsIn(
             ActionsTestUtil.prettyArtifactNames(
                 getConfiguredTarget("//java/com/server")