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

2 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
index c3ddf00003..f4fb0338e2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
@@ -721,12 +721,12 @@ public final class ReleaseBundlingSupport {
         ShellUtils.shellEscape(objcConfiguration.getIosSimulatorVersion().toString());
     ImmutableList<Substitution> substitutions = ImmutableList.of(
         Substitution.of("%app_name%", ruleContext.getLabel().getName()),
-        Substitution.of("%ipa_file%", ipaInput.getRootRelativePath().getPathString()),
+        Substitution.of("%ipa_file%", ipaInput.getRunfilesPathString()),
         Substitution.of("%sim_device%", escapedSimDevice),
         Substitution.of("%sdk_version%", escapedSdkVersion),
-        Substitution.of("%iossim%", attributes.iossim().getRootRelativePath().getPathString()),
+        Substitution.of("%iossim%", attributes.iossim().getRunfilesPathString()),
         Substitution.of("%std_redirect_dylib_path%",
-            attributes.stdRedirectDylib().getRootRelativePath().getPathString()));
+            attributes.stdRedirectDylib().getRunfilesPathString()));
 
     ruleContext.registerAction(
         new TemplateExpansionAction(ruleContext.getActionOwner(), attributes.runnerScriptTemplate(),
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();
   }