From 7618bbd08f57a4c4996bcdd2d3472261d4a573e9 Mon Sep 17 00:00:00 2001
From: Adam Michael <ajmichael@google.com>
Date: Tue, 17 Jan 2017 20:06:09 +0000
Subject: Description redacted. -- PiperOrigin-RevId: 144739068
 MOS_MIGRATED_REVID=144739068

---
 src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java  | 6 ++----
 .../google/devtools/build/lib/bazel/rules/python/stub_template.txt  | 1 -
 .../com/google/devtools/build/lib/exec/StandaloneTestStrategy.java  | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/main/java/com/google')

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 a7723f7b8e..dd2d5de509 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 @@ public class BaseSpawn implements Spawn {
     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();
     }
   }
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 55f0e7e488..04316fea4d 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 @@ def Main():
     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
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 b444544ca6..9b2e1d3ab8 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 @@ public class StandaloneTestStrategy extends TestStrategy {
     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());
-- 
cgit v1.2.3