Remove ObjCModuleMapWorkarounds option
This has been in stable for over a month now and is okay to remove.
PiperOrigin-RevId: 182258581
diff --git a/src/TulsiGenerator/Base.lproj/Options.strings b/src/TulsiGenerator/Base.lproj/Options.strings
index 8cd3ca0..ddaa34d 100644
--- a/src/TulsiGenerator/Base.lproj/Options.strings
+++ b/src/TulsiGenerator/Base.lproj/Options.strings
@@ -21,7 +21,6 @@
"BazelBuildStartupOptionsRelease" = "Release";
"BazelContinueBuildingAfterError" = "Continue building after error";
-"ObjCModuleMapWorkarounds" = "Experimental improvements for ObjC Modules in Swift.";
"UseAspectForTestSuites" = "Expand test_suites via an aspect instead of bazel query.";
"UseAspectForTestSuites_DESC" = "Requires a Bazel which supports --noexpand_test_suites";
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
index 779924f..79b398f 100644
--- a/src/TulsiGenerator/PBXTargetGenerator.swift
+++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -1179,12 +1179,9 @@
// explicitly passing them via -fmodule-map-file: Xcode 8 seems to ignore the
// -fmodule-map-file flag when using SourceKit for CMD+click and Xcode 9 seems to only
// pass in the last -fmodule-map-file flag given.
- let enableObjCModuleMapWorkaround = options[.ObjCModuleMapWorkarounds].commonValueAsBool ?? true
- if enableObjCModuleMapWorkaround {
- for moduleMap in ruleEntry.objCModuleMaps {
- let fullPath = (moduleMap.fullPath as NSString).deletingLastPathComponent
- includes.add("$(\(PBXTargetGenerator.BazelWorkspaceSymlinkVarName))/\(fullPath)")
- }
+ for moduleMap in ruleEntry.objCModuleMaps {
+ let fullPath = (moduleMap.fullPath as NSString).deletingLastPathComponent
+ includes.add("$(\(PBXTargetGenerator.BazelWorkspaceSymlinkVarName))/\(fullPath)")
}
}
diff --git a/src/TulsiGenerator/TulsiOptionSet.swift b/src/TulsiGenerator/TulsiOptionSet.swift
index d8932f4..c75c58d 100644
--- a/src/TulsiGenerator/TulsiOptionSet.swift
+++ b/src/TulsiGenerator/TulsiOptionSet.swift
@@ -40,9 +40,6 @@
// Option to enable compilation after error.
BazelContinueBuildingAfterError,
- // Option to enable ObjC module map workarounds in the generated Xcodeproj.
- ObjCModuleMapWorkarounds,
-
// Include all .bzl files related to the build in the generated Xcodeproj.
IncludeBuildSources,
@@ -274,7 +271,6 @@
addBoolOption(.ALWAYS_SEARCH_USER_PATHS, .BuildSetting, false)
addBoolOption(.BazelContinueBuildingAfterError, .Generic, false)
- addBoolOption(.ObjCModuleMapWorkarounds, .Generic, true)
addBoolOption(.UseAspectForTestSuites, .Generic, false)
addStringOption(.BazelBuildOptionsDebug, [.TargetSpecializable, .SupportsInheritKeyword])
addStringOption(.BazelBuildOptionsRelease, [.TargetSpecializable, .SupportsInheritKeyword])
