By default, don't create the .runfiles/workspace/external/repo dirs

RELNOTES[INC]: External runfiles will now be accessible only via their
.runfiles/repo/path/to/target path, not .runfiles/workspace-name/external/repo/path/to/target.
If code still needs to use the legacy path, it can set --legacy_external_runfiles
temporarily, but should transition to using the default location as it is more
portable (see https://groups.google.com/d/msg/bazel-discuss/_Xo14sf7fHw/g7wdatTGBgAJ
for details).  The --legacy_external_runfiles option will be removed for the next release.

--
MOS_MIGRATED_REVID=123217489

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
index 00e54eae1b..7b911c5866 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
@@ -127,15 +127,15 @@ public class TestSupport {
    */
   private ImmutableList<Substitution> substitutionsForSimulator() {
     ImmutableList.Builder<Substitution> substitutions = new ImmutableList.Builder<Substitution>()
-        .add(Substitution.of("%(iossim_path)s", iossim().getRootRelativePath().getPathString()))
+        .add(Substitution.of("%(iossim_path)s", iossim().getRunfilesPathString()))
         .add(Substitution.of("%(std_redirect_dylib_path)s",
-            stdRedirectDylib().getRootRelativePath().getPathString()))
+            stdRedirectDylib().getRunfilesPathString()))
         .addAll(deviceSubstitutions().getSubstitutionsForTestRunnerScript());
 
     Optional<Artifact> testRunner = testRunner();
     if (testRunner.isPresent()) {
       substitutions.add(
-          Substitution.of("%(testrunner_binary)s", testRunner.get().getRootRelativePathString()));
+          Substitution.of("%(testrunner_binary)s", testRunner.get().getRunfilesPathString()));
     }
     return substitutions.build();
   }