Make xcode project generation generate correct filenames for external repos

--
MOS_MIGRATED_REVID=114350802

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
index 0dd0d5acab..4ed2341fa2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
@@ -512,8 +512,14 @@ public final class XcodeProvider implements TransitiveInfoProvider {
   }
 
   private static String xcodeTargetName(Label label, String labelSuffix) {
-    String pathFromWorkspaceRoot = (label + labelSuffix).replace("//", "")
-        .replace(':', '/');
+    String pathFromWorkspaceRoot = label + labelSuffix;
+    if (label.getPackageIdentifier().getRepository().isDefault()) {
+      pathFromWorkspaceRoot = pathFromWorkspaceRoot.replace("//", "")
+          .replace(':', '/');
+    } else {
+      pathFromWorkspaceRoot = pathFromWorkspaceRoot.replace("//", "_")
+          .replace(':', '/').replace("@", "external_");
+    }
     List<String> components = Splitter.on('/').splitToList(pathFromWorkspaceRoot);
     return Joiner.on('_').join(Lists.reverse(components));
   }