Use the same output base for Xcode Build and Index Build

By using `--preemptible` Bazel flag on Index Builds, normal builds will cause them to cancel instead of block for them. This along with Xcode’s default interrupt means that Index Builds are able to use the same output base with minimal impact to normal builds. This change has numerous benefits: - Indexing completes faster since it can reuse any normal builds that have happened, including analysis - Normal builds complete faster because it can leverage the work done by background Index Builds - Quickly open won’t show two source paths anymore for generated files, since there is now only one path - With only one output base, disk usage is drastically cut down - There is one less Bazel server, so memory usage is drastically cut down Signed-off-by: Brentley Jones <github@brentleyjones.com>
MobileNativeFoundation · Aug 20, 2024 · 651b15a · 651b15a
1 parent 1588079
commit 651b15a
Show file tree

Hide file tree

Showing 19 changed files with 221 additions and 357 deletions.
diff --git a/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj
diff --git a/examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj
diff --git a/tools/generators/legacy/src/Generator/CreateProject.swift b/tools/generators/legacy/src/Generator/CreateProject.swift
@@ -63,12 +63,6 @@ extension Generator {
         let projectDirComponents = absoluteProjectDirPath
             .split(separator: "/", omittingEmptySubsequences: false)
 
-        // build_output_base/execroot/_main -> indexbuild_output_base/execroot/_main
-        let indexingProjectDirPath =
-            (projectDirComponents.prefix(upTo: projectDirComponents.count - 3) +
-             ["indexbuild_output_base"] +
-             projectDirComponents.suffix(2)).joined(separator: "/")
-
         var buildSettings: [String: Any] = [
             "ALWAYS_SEARCH_USER_PATHS": false,
             "BAZEL_CONFIG": project.bazelConfig,
@@ -101,9 +95,6 @@ $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
             "INDEX_DATA_STORE_DIR": "$(INDEX_DATA_STORE_DIR)",
             "INDEX_FORCE_SCRIPT_EXECUTION": true,
             "INDEX_IMPORT": indexImport,
-            "INDEXING_PROJECT_DIR__": "$(INDEXING_PROJECT_DIR__NO)",
-            "INDEXING_PROJECT_DIR__NO": absoluteProjectDirPath,
-            "INDEXING_PROJECT_DIR__YES": indexingProjectDirPath,
             "INSTALL_PATH": "$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)/bin",
             "INTERNAL_DIR": """
 $(PROJECT_FILE_PATH)/\(directories.internalDirectoryName)
@@ -114,9 +105,7 @@ $(PROJECT_FILE_PATH)/\(directories.internalDirectoryName)
             // `link.params`
             "LD_RUNPATH_SEARCH_PATHS": "",
             "ONLY_ACTIVE_ARCH": true,
-            "PROJECT_DIR": """
-$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))
-""",
+            "PROJECT_DIR": absoluteProjectDirPath,
             "RULES_XCODEPROJ_BUILD_MODE": buildMode.rawValue,
             "SRCROOT": srcRoot,
             // Bazel currently doesn't support Catalyst

diff --git a/tools/generators/legacy/src/Generator/SetTargetConfigurations.swift b/tools/generators/legacy/src/Generator/SetTargetConfigurations.swift
@@ -439,8 +439,6 @@ $(BAZEL_OUT)\#(swiftParams.path.string.dropFirst(9))
                         "$(DERIVED_FILE_DIR)/xcode-overlay.yaml",
                         "-Xcc",
                         "-ivfsoverlay",
-                        "-Xcc",
-                        "$(OBJROOT)/bazel-out-overlay.yaml",
                     ])
                 }
 
@@ -463,30 +461,9 @@ $(BAZEL_OUT)\#(swiftParams.path.string.dropFirst(9))
                     swiftFlagsPrefix.append(contentsOf: [
                         "-Xcc",
                         "-ivfsoverlay",
-                        "-Xcc",
-                        "$(OBJROOT)/bazel-out-overlay.yaml",
                     ])
                 }
             }
-
-            if !swiftFlags.isEmpty {
-                swiftFlagsPrefix.append(contentsOf: [
-                    "-vfsoverlay",
-                    "$(OBJROOT)/bazel-out-overlay.yaml",
-                ])
-            }
-            if !cFlags.isEmpty {
-                cFlagsPrefix.append(contentsOf: [
-                    "-ivfsoverlay",
-                    "$(OBJROOT)/bazel-out-overlay.yaml",
-                ])
-            }
-            if !cxxFlags.isEmpty {
-                cxxFlagsPrefix.append(contentsOf: [
-                    "-ivfsoverlay",
-                    "$(OBJROOT)/bazel-out-overlay.yaml",
-                ])
-            }
         }
 
         if buildSettings.keys.contains("PREVIEWS_SWIFT_INCLUDE__YES") {

diff --git a/tools/generators/legacy/test/CreateProjectTests.swift b/tools/generators/legacy/test/CreateProjectTests.swift
@@ -81,21 +81,14 @@ $(INDEXING_DEPLOYMENT_LOCATION__NO)
 """,
             "INDEXING_DEPLOYMENT_LOCATION__NO": true,
             "INDEXING_DEPLOYMENT_LOCATION__YES": false,
-            "INDEXING_PROJECT_DIR__": "$(INDEXING_PROJECT_DIR__NO)",
-            "INDEXING_PROJECT_DIR__NO": """
-/tmp/bazel-output-base/rules_xcodeproj/build_output_base/execroot/rules_xcodeproj
-""",
-            "INDEXING_PROJECT_DIR__YES": """
-/tmp/bazel-output-base/rules_xcodeproj/indexbuild_output_base/execroot/rules_xcodeproj
-""",
             "INSTALL_PATH": "$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)/bin",
             "INTERNAL_DIR": "$(PROJECT_FILE_PATH)/r_xcp",
             "LD_OBJC_ABI_VERSION": "",
             "LD_DYLIB_INSTALL_NAME": "",
             "LD_RUNPATH_SEARCH_PATHS": "",
             "ONLY_ACTIVE_ARCH": true,
             "PROJECT_DIR": """
-$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))
+/tmp/bazel-output-base/rules_xcodeproj/build_output_base/execroot/rules_xcodeproj
 """,
             "RULES_XCODEPROJ_BUILD_MODE": "xcode",
             "SRCROOT": directories.workspace.string,
@@ -227,21 +220,14 @@ $(BUILD_DIR)/$(BAZEL_PACKAGE_BIN_DIR)
             "INDEX_DATA_STORE_DIR": "$(INDEX_DATA_STORE_DIR)",
             "INDEX_FORCE_SCRIPT_EXECUTION": true,
             "INDEX_IMPORT": "/tmp/index-import",
-            "INDEXING_PROJECT_DIR__": "$(INDEXING_PROJECT_DIR__NO)",
-            "INDEXING_PROJECT_DIR__NO": """
-/tmp/bazel-output-base/rules_xcodeproj/build_output_base/execroot/rules_xcodeproj
-""",
-            "INDEXING_PROJECT_DIR__YES": """
-/tmp/bazel-output-base/rules_xcodeproj/indexbuild_output_base/execroot/rules_xcodeproj
-""",
             "INSTALL_PATH": "$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)/bin",
             "INTERNAL_DIR": "$(PROJECT_FILE_PATH)/r_xcp",
             "LD_OBJC_ABI_VERSION": "",
             "LD_DYLIB_INSTALL_NAME": "",
             "LD_RUNPATH_SEARCH_PATHS": "",
             "ONLY_ACTIVE_ARCH": true,
             "PROJECT_DIR": """
-$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))
+/tmp/bazel-output-base/rules_xcodeproj/build_output_base/execroot/rules_xcodeproj
 """,
             "RULES_XCODEPROJ_BUILD_MODE": "bazel",
             "SRCROOT": directories.workspace.string,

diff --git a/tools/generators/legacy/test/Fixtures.swift b/tools/generators/legacy/test/Fixtures.swift
@@ -2067,7 +2067,6 @@ touch "$SCRIPT_OUTPUT_FILE_1"
                 "COMPILE_TARGET_NAME": targets["A 1"]!.name,
                 "MACOSX_DEPLOYMENT_TARGET": "10.0",
                 "OTHER_SWIFT_FLAGS": #"""
--vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml \#
 @$(DERIVED_FILE_DIR)/swift.compile.params
 """#,
                 "PRODUCT_NAME": "a",
@@ -2210,8 +2209,6 @@ $(BUILD_DIR)/bazel-out/a1b2c/bin/A 2/A.app/A_ExecutableName
                 "COMPILE_TARGET_NAME": targets["E1"]!.name,
                 "OTHER_SWIFT_FLAGS": #"""
 -Xcc -ivfsoverlay -Xcc $(DERIVED_FILE_DIR)/xcode-overlay.yaml \#
--Xcc -ivfsoverlay -Xcc $(OBJROOT)/bazel-out-overlay.yaml \#
--vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml \#
 @$(DERIVED_FILE_DIR)/swift.compile.params
 """#,
                 "PRODUCT_NAME": "E1",
@@ -2231,7 +2228,6 @@ $(BAZEL_OUT)/E1.swift.compile.params
                 "BAZEL_TARGET_ID[sdk=appletvos*]": "$(BAZEL_TARGET_ID)",
                 "COMPILE_TARGET_NAME": targets["E2"]!.name,
                 "OTHER_SWIFT_FLAGS": #"""
--vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml \#
 @$(DERIVED_FILE_DIR)/swift.compile.params
 """#,
                 "PRODUCT_NAME": "E2",
@@ -2314,7 +2310,6 @@ $(MACOSX_FILES)
 "T/T 3/Ta.c" "T/T 3/Ta.swift"
 """,
                 "OTHER_SWIFT_FLAGS": #"""
--vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml \#
 @$(DERIVED_FILE_DIR)/swift.compile.params
 """#,
                 "PRODUCT_NAME": "t",

diff --git a/tools/generators/pbxnativetargets/README.md b/tools/generators/pbxnativetargets/README.md
@@ -124,7 +124,7 @@ Here is an example output:
 				LINK_PARAMS_FILE = "$(BAZEL_OUT)/darwin_arm64-dbg/bin/external/_main~internal~rules_xcodeproj_generated/generator/tools/xcodeproj/xcodeproj-params/pbxtargetdependencies_tests.25.link.params";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				OTHER_LDFLAGS = "@$(DERIVED_FILE_DIR)/link.params";
-				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -Xcc -ivfsoverlay$(OBJROOT)/bazel-out-overlay.yaml -vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml $(PREVIEWS_SWIFT_INCLUDE__$(ENABLE_PREVIEWS)) -DDEBUG -Onone -enable-testing -F$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/Library/Frameworks -I$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/usr/lib -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~non_module_deps~com_github_apple_swift_argument_parser -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/lib/ToolCommon -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~non_module_deps~com_github_apple_swift_collections -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/generators/lib/PBXProj -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/generators/pbxtargetdependencies -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_swift_custom_dump -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin -static -Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all";
+				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) $(PREVIEWS_SWIFT_INCLUDE__$(ENABLE_PREVIEWS)) -DDEBUG -Onone -enable-testing -F$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/Library/Frameworks -I$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/usr/lib -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~non_module_deps~com_github_apple_swift_argument_parser -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/lib/ToolCommon -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~non_module_deps~com_github_apple_swift_collections -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/generators/lib/PBXProj -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/generators/pbxtargetdependencies -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_swift_custom_dump -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin -static -Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all";
 				PREVIEWS_SWIFT_INCLUDE__ = "";
 				PREVIEWS_SWIFT_INCLUDE__NO = "";
 				PREVIEWS_SWIFT_INCLUDE__YES = "-I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin/tools/generators/pbxtargetdependencies";
@@ -153,7 +153,7 @@ Here is an example output:
 				LINK_PARAMS_FILE = "$(BAZEL_OUT)/darwin_arm64-dbg/bin/external/_main~internal~rules_xcodeproj_generated/generator/tools/xcodeproj/xcodeproj-params/pbxtargetdependencies_tests.54.link.params";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				OTHER_LDFLAGS = "@$(DERIVED_FILE_DIR)/link.params";
-				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -Xcc -ivfsoverlay$(OBJROOT)/bazel-out-overlay.yaml -vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml $(PREVIEWS_SWIFT_INCLUDE__$(ENABLE_PREVIEWS)) -DNDEBUG -O -F$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/Library/Frameworks -I$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/usr/lib -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~non_module_deps~com_github_apple_swift_argument_parser -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/lib/ToolCommon -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~non_module_deps~com_github_apple_swift_collections -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/generators/lib/PBXProj -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/generators/pbxtargetdependencies -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_swift_custom_dump -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin -static -Xcc -Os -Xcc -DNDEBUG=1 -Xcc -Wno-unused-variable -Xcc -Winit-self -Xcc -Wno-extra";
+				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) $(PREVIEWS_SWIFT_INCLUDE__$(ENABLE_PREVIEWS)) -DNDEBUG -O -F$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/Library/Frameworks -I$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/usr/lib -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~non_module_deps~com_github_apple_swift_argument_parser -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/lib/ToolCommon -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~non_module_deps~com_github_apple_swift_collections -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/generators/lib/PBXProj -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/generators/pbxtargetdependencies -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay -I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/external/_main~dev_non_module_deps~com_github_pointfreeco_swift_custom_dump -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin -static -Xcc -Os -Xcc -DNDEBUG=1 -Xcc -Wno-unused-variable -Xcc -Winit-self -Xcc -Wno-extra";
 				PREVIEWS_SWIFT_INCLUDE__ = "";
 				PREVIEWS_SWIFT_INCLUDE__NO = "";
 				PREVIEWS_SWIFT_INCLUDE__YES = "-I$(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin/tools/generators/pbxtargetdependencies";
@@ -230,7 +230,7 @@ Here is an example output:
 				BAZEL_TARGET_ID = "@@_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay//:XCTestDynamicOverlay macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee";
 				COMPILE_TARGET_NAME = XCTestDynamicOverlay;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -Xcc -ivfsoverlay$(OBJROOT)/bazel-out-overlay.yaml -vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml -DDEBUG -Onone -enable-testing -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin -static -Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all";
+				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -DDEBUG -Onone -enable-testing -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-dbg-ST-95054d4cebee/bin -static -Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all";
 				PRODUCT_MODULE_NAME = XCTestDynamicOverlay;
 				PRODUCT_NAME = XCTestDynamicOverlay;
 				SDKROOT = macosx;
@@ -250,7 +250,7 @@ Here is an example output:
 				BAZEL_TARGET_ID = "@@_main~dev_non_module_deps~com_github_pointfreeco_xctest_dynamic_overlay//:XCTestDynamicOverlay macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9";
 				COMPILE_TARGET_NAME = XCTestDynamicOverlay;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -Xcc -ivfsoverlay$(OBJROOT)/bazel-out-overlay.yaml -vfsoverlay $(OBJROOT)/bazel-out-overlay.yaml -DNDEBUG -O -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin -static -Xcc -Os -Xcc -DNDEBUG=1 -Xcc -Wno-unused-variable -Xcc -Winit-self -Xcc -Wno-extra";
+				OTHER_SWIFT_FLAGS = "-Xcc -working-directory -Xcc $(PROJECT_DIR) -working-directory $(PROJECT_DIR) -DNDEBUG -O -Xcc -iquote -Xcc $(PROJECT_DIR) -Xcc -iquote -Xcc $(BAZEL_OUT)/macos-arm64-min13.0-applebin_macos-darwin_arm64-opt-ST-1f5196d1a0d9/bin -static -Xcc -Os -Xcc -DNDEBUG=1 -Xcc -Wno-unused-variable -Xcc -Winit-self -Xcc -Wno-extra";
 				PRODUCT_MODULE_NAME = XCTestDynamicOverlay;
 				PRODUCT_NAME = XCTestDynamicOverlay;
 				SDKROOT = macosx;

diff --git a/tools/generators/pbxproj_prefix/README.md b/tools/generators/pbxproj_prefix/README.md
@@ -217,9 +217,6 @@ Here is an example output:
 				IMPORT_INDEX_BUILD_INDEXSTORES = YES;
 				INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)";
 				INDEX_IMPORT = "$(BAZEL_OUT)/darwin_arm64-opt-exec-2B5CBBC6/bin/external/_main~non_module_deps~rules_xcodeproj_index_import/index-import";
-				INDEXING_PROJECT_DIR__ = "$(INDEXING_PROJECT_DIR__NO)";
-				INDEXING_PROJECT_DIR__NO = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/build_output_base/execroot/_main";
-				INDEXING_PROJECT_DIR__YES = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/indexbuild_output_base/execroot/_main";
 				INDEX_FORCE_SCRIPT_EXECUTION = YES;
 				INSTALL_PATH = "$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)/bin";
 				INTERNAL_DIR = "$(PROJECT_FILE_PATH)/rules_xcodeproj";
@@ -230,7 +227,7 @@ Here is an example output:
 				LD_RUNPATH_SEARCH_PATHS = "";
 				LIBTOOL = "$(BAZEL_INTEGRATION_DIR)/libtool";
 				ONLY_ACTIVE_ARCH = YES;
-				PROJECT_DIR = "$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))";
+				PROJECT_DIR = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/build_output_base/execroot/_main";
 				RESOLVED_REPOSITORIES = "\"\" \"/tmp/workspace\"";
 				RULES_XCODEPROJ_BUILD_MODE = bazel;
 				SRCROOT = /tmp/workspace;
@@ -280,9 +277,6 @@ Here is an example output:
 				IMPORT_INDEX_BUILD_INDEXSTORES = YES;
 				INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)";
 				INDEX_IMPORT = "$(BAZEL_OUT)/darwin_arm64-opt-exec-2B5CBBC6/bin/external/_main~non_module_deps~rules_xcodeproj_index_import/index-import";
-				INDEXING_PROJECT_DIR__ = "$(INDEXING_PROJECT_DIR__NO)";
-				INDEXING_PROJECT_DIR__NO = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/build_output_base/execroot/_main";
-				INDEXING_PROJECT_DIR__YES = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/indexbuild_output_base/execroot/_main";
 				INDEX_FORCE_SCRIPT_EXECUTION = YES;
 				INSTALL_PATH = "$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)/bin";
 				INTERNAL_DIR = "$(PROJECT_FILE_PATH)/rules_xcodeproj";
@@ -293,7 +287,7 @@ Here is an example output:
 				LD_RUNPATH_SEARCH_PATHS = "";
 				LIBTOOL = "$(BAZEL_INTEGRATION_DIR)/libtool";
 				ONLY_ACTIVE_ARCH = YES;
-				PROJECT_DIR = "$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))";
+				PROJECT_DIR = "/tmp/workspace/bazel-output-base/rules_xcodeproj.noindex/build_output_base/execroot/_main";
 				RESOLVED_REPOSITORIES = "\"\" \"/tmp/workspace\"";
 				RULES_XCODEPROJ_BUILD_MODE = bazel;
 				SRCROOT = /tmp/workspace;

diff --git a/tools/generators/pbxproj_prefix/src/Generator/PBXProjectBuildSettings.swift b/tools/generators/pbxproj_prefix/src/Generator/PBXProjectBuildSettings.swift
@@ -101,18 +101,6 @@ extension Generator {
                 key: "IMPORT_INDEX_BUILD_INDEXSTORES",
                 value: importIndexBuildIndexstores ? "YES" : "NO"
             ),
-            .init(
-                key: "INDEXING_PROJECT_DIR__",
-                value: #""$(INDEXING_PROJECT_DIR__NO)""#
-            ),
-            .init(
-                key: "INDEXING_PROJECT_DIR__NO",
-                value: projectDir.pbxProjEscaped
-            ),
-            .init(
-                key: "INDEXING_PROJECT_DIR__YES",
-                value: indexingProjectDir.pbxProjEscaped
-            ),
             .init(
                 key: "INDEX_DATA_STORE_DIR",
                 value: #""$(INDEX_DATA_STORE_DIR)""#
@@ -138,8 +126,7 @@ extension Generator {
             .init(key: "ONLY_ACTIVE_ARCH", value: "YES"),
             .init(
                 key: "PROJECT_DIR",
-                value:
-                    #""$(INDEXING_PROJECT_DIR__$(INDEX_ENABLE_BUILD_ARENA))""#
+                value: projectDir.pbxProjEscaped
             ),
             .init(
                 key: "RESOLVED_REPOSITORIES",