Description redacted.
--
PiperOrigin-RevId: 144739068
MOS_MIGRATED_REVID=144739068

src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java b/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java
index a7723f7..dd2d5de 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java
@@ -218,17 +218,15 @@
     PathFragment runfilesRoot = getRunfilesRoot();
     if (runfilesRoot == null
         || (environment.containsKey("JAVA_RUNFILES")
-            && environment.containsKey("PYTHON_RUNFILES")
-            && environment.containsKey("RUNFILES_DIR"))) {
+            && environment.containsKey("PYTHON_RUNFILES"))) {
       return environment;
     } else {
       ImmutableMap.Builder<String, String> env = ImmutableMap.builder();
       env.putAll(environment);
-      // TODO(bazel-team): Remove JAVA_RUNFILES and PYTHON_RUNFILES.
+      // TODO(bazel-team): Unify these into a single env variable.
       String runfilesRootString = runfilesRoot.getPathString();
       env.put("JAVA_RUNFILES", runfilesRootString);
       env.put("PYTHON_RUNFILES", runfilesRootString);
-      env.put("RUNFILES_DIR", runfilesRootString);
       return env.build();
     }
   }

src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
index 55f0e7e..04316fe 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
@@ -105,7 +105,6 @@
     python_path += separator + old_python_path
 
   new_env['PYTHONPATH'] = python_path
-  new_env['RUNFILES_DIR'] = module_space
 
   # Now look for my main python source file.
   # The magic string percent-main-percent is replaced with the filename of the

src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index b444544..9b2e1d3 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -248,7 +248,6 @@
     String testSrcDir = runfilesDir.relativeTo(execRoot).getPathString();
     env.put("JAVA_RUNFILES", testSrcDir);
     env.put("PYTHON_RUNFILES", testSrcDir);
-    env.put("RUNFILES_DIR", testSrcDir);
     env.put("TEST_SRCDIR", testSrcDir);
     env.put("TEST_TMPDIR", tmpDirString);
     env.put("TEST_WORKSPACE", action.getRunfilesPrefix());

src/test/java/com/google/devtools/build/lib/actions/BaseSpawnTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/actions/BaseSpawnTest.java b/src/test/java/com/google/devtools/build/lib/actions/BaseSpawnTest.java
index 5d31bef..07abe52 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/BaseSpawnTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/BaseSpawnTest.java
@@ -65,7 +65,6 @@
         .putAll(baseEnviron)
         .put("PYTHON_RUNFILES", runfilesDir)
         .put("JAVA_RUNFILES", runfilesDir)
-        .put("RUNFILES_DIR", runfilesDir)
         .build();
 
     assertThat(underTest.getEnvironment()).isEqualTo(expected);
@@ -83,7 +82,6 @@
         .putAll(baseEnviron)
         .put("PYTHON_RUNFILES", runfilesDir)
         .put("JAVA_RUNFILES", runfilesDir)
-        .put("RUNFILES_DIR", runfilesDir)
         .build();
 
     assertThat(underTest.getEnvironment()).isEqualTo(expected);

src/test/shell/bazel/bazel_rules_test.sh

diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh
index 517a9dd..93bfa41 100755
--- a/src/test/shell/bazel/bazel_rules_test.sh
+++ b/src/test/shell/bazel/bazel_rules_test.sh
@@ -382,29 +382,6 @@
  expect_log "The number is 42"
 }
 
-function test_python_runfiles() {
-  create_new_workspace
-  cd "${new_workspace_dir}"
-  mkdir py
-  cat > py/BUILD <<EOF
-py_binary(name="a", srcs=["a.py"], data=["foobar"])
-EOF
-
-  cat > py/a.py <<EOF
-import os
-
-for l in file(os.environ["RUNFILES_DIR"] + "/__main__/py/foobar").readlines():
-  print l
-EOF
-
-  echo KITTEN > py/foobar
-
-  bazel build //py:a || fail "build failed"
-  bazel-bin/py/a >&$TEST_log || fail "run failed"
-  expect_log KITTEN
-
-}
-
 function test_build_with_aliased_input_file() {
   mkdir -p a
   cat > a/BUILD <<EOF