Update spotlight index for dSYM.

Without this change, Spotlight sometimes fails to find the updated
plist within the dSYM bundle, and breakpoints fail to resolve.

As long as we always make sure that the dSYM bundle is updated in the
Spotlight index, that problem goes away.

PiperOrigin-RevId: 182266575
diff --git a/src/TulsiGenerator/BazelBuildSettingsFeatures.swift b/src/TulsiGenerator/BazelBuildSettingsFeatures.swift
index b48ff5f..9244623 100644
--- a/src/TulsiGenerator/BazelBuildSettingsFeatures.swift
+++ b/src/TulsiGenerator/BazelBuildSettingsFeatures.swift
@@ -16,7 +16,7 @@
   // For non-distributed builds.
   "TULSI_DEBUG_PREFIX_MAP",
   // TODO(b/71515804): Remove if no issues are found in replacing post_processor with this.
-//  "TULSI_PATCHLESS_DSYMS",
+  "TULSI_PATCHLESS_DSYMS",
   // TODO(b/71645041): Remove if no issues are found in focusing our remapping like this.
   "TULSI_STRICTER_REMAPPING",
   // TODO(b/71714998): Remove if no issues are found in adding a trailing slash to our remappings.
diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index 3af8563..1dc686c 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -1691,6 +1691,10 @@
         if returncode:
           return returncode
 
+    # Update spotlight index with this updated dSYM bundle in case the binary's
+    # UUID changed.
+    self._RunSubprocess(['mdimport', dsym_bundle_path])
+
     return 0
 
   def _PatchdSYMPaths(self, dsym_bundle_path):
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index 5b9931a..4d6b07f 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -962,6 +962,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = ComplexSingleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1138,6 +1139,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = ComplexSingleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1335,6 +1337,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = ComplexSingleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1453,6 +1456,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = ComplexSingleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
index 0ccd722..012603a 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
@@ -204,6 +204,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = IosLegacyTestProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -269,6 +270,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = IosLegacyTestProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -340,6 +342,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = IosLegacyTestProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -405,6 +408,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = IosLegacyTestProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index 48eebac..d7629c7 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -344,6 +344,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = macosx;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -444,6 +445,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = macosx;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -550,6 +552,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -666,6 +669,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index 3074764..a37dc8b 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -525,6 +525,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = macosx;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -661,6 +662,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = macosx;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -825,6 +827,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -969,6 +972,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = MacOSTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index cf674fc..969714b 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -248,6 +248,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleCCProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -313,6 +314,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleCCProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -384,6 +386,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleCCProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -449,6 +452,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleCCProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index 03fb5f2..8d76e9f 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -576,6 +576,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -709,6 +710,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -863,6 +865,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -981,6 +984,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
index 7abd20a..7a31f9b 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
@@ -780,6 +780,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 3;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleSkylarkProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -978,6 +979,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 3;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleSkylarkProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1204,6 +1206,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				SWIFT_VERSION = 3;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleSkylarkProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1375,6 +1378,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				SWIFT_VERSION = 3;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SimpleSkylarkProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 90a32fa..9f2d082 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -337,6 +337,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SwiftProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -433,6 +434,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SwiftProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -535,6 +537,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				SWIFT_VERSION = 4;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SwiftProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -602,6 +605,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				SWIFT_VERSION = 4;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = SwiftProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index 7bd193a..af74827 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -533,6 +533,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -675,6 +676,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -852,6 +854,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -1002,6 +1005,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 06b18ce..4185c26 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -367,6 +367,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -467,6 +468,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -588,6 +590,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -682,6 +685,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index 7aedb64..bd0f1db 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -521,6 +521,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -663,6 +664,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -840,6 +842,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -990,6 +993,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index 760e106..2d640ee 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -403,6 +403,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = WatchProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -516,6 +517,7 @@
 				PYTHONIOENCODING = utf8;
 				SDKROOT = iphoneos;
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = WatchProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -635,6 +637,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = WatchProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;
@@ -751,6 +754,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+				TULSI_PATCHLESS_DSYMS = YES;
 				TULSI_PROJECT = WatchProject;
 				TULSI_STRICTER_REMAPPING = YES;
 				TULSI_TRAILING_SLASHES = YES;