Do not collide intermediate and final output dsym artifacts.

--
MOS_MIGRATED_REVID=119848254

2 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index e18d2dc012..d974deb37e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -469,7 +469,6 @@ public final class CompilationSupport {
    *
    * @param sourceFile the artifact to compile
    * @param objFile the resulting object artifact
-   * @param intermediateArtifacts intermediary artifacts
    * @param objcProvider ObjcProvider instance for this invocation
    */
   private void registerSwiftCompileAction(
@@ -1265,7 +1264,7 @@ public final class CompilationSupport {
     Artifact debugSymbolFile = intermediateArtifacts.dsymSymbol(dsymOutputType);
     Artifact dsymPlist = intermediateArtifacts.dsymPlist(dsymOutputType);
 
-    PathFragment dsymOutputDir = removeSuffix(tempDsymBundleZip.getExecPath(), ".zip");
+    PathFragment dsymOutputDir = removeSuffix(tempDsymBundleZip.getExecPath(), ".temp.zip");
     PathFragment dsymPlistZipEntry = dsymPlist.getExecPath().relativeTo(dsymOutputDir);
     PathFragment debugSymbolFileZipEntry =
         debugSymbolFile
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java
index 62cec0444c..9da81f83c4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java
@@ -33,6 +33,13 @@ public final class IntermediateArtifacts {
   static final String LINKMAP_SUFFIX = ".linkmap";
   static final String BREAKPAD_SUFFIX = ".breakpad";
 
+  /**
+   * Extension used for the zip archive containing dsym files and their associated plist. Note that
+   * the archive's path less this extension corresponds to the expected directory for dsym files
+   * relative to their binary.
+   */
+  static final String DSYM_ZIP_EXTENSION = ".temp.zip";
+
   private final RuleContext ruleContext;
   private final String archiveFileNameSuffix;
   private final String outputPrefix;
@@ -296,7 +303,7 @@ public final class IntermediateArtifacts {
    * The temp zipped debug symbol bundle file which contains debug symbols generated by dsymutil.
    */
   public Artifact tempDsymBundleZip(DsymOutputType dsymOutputType) {
-    return appendExtension(dsymOutputType.getSuffix() + ".zip");
+    return appendExtension(dsymOutputType.getSuffix() + DSYM_ZIP_EXTENSION);
   }
 
   /**