Automated rollback of commit 71998c8.

PiperOrigin-RevId: 354172938
Enflick · Jan 27, 2021 · 6dc76fe · 6dc76fe
1 parent 71998c8
commit 6dc76fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/swift/internal/derived_files.bzl b/swift/internal/derived_files.bzl
@@ -108,11 +108,7 @@ def _intermediate_object_file(actions, target_name, src):
     )
 
 def _module_map(actions, target_name):
-    """Declares the module map for a target.
-
-    These module maps are used when generating a Swift-compatible module map for
-    a C/Objective-C target, and also when generating the module map for the
-    generated header of a Swift target.
+    """Declares the module map for the generated header of a target.
 
     Args:
         actions: The context's actions object.
@@ -121,7 +117,9 @@ def _module_map(actions, target_name):
     Returns:
         The declared `File`.
     """
-    return actions.declare_file("{}.swift.modulemap".format(target_name))
+    return actions.declare_file(
+        "{}.modulemaps/module.modulemap".format(target_name),
+    )
 
 def _modulewrap_object(actions, target_name):
     """Declares the object file used to wrap Swift modules for ELF binaries.

diff --git a/test/private_deps_tests.bzl b/test/private_deps_tests.bzl
@@ -91,8 +91,8 @@ def private_deps_test_suite():
     private_deps_provider_test(
         name = "{}_client_cc_deps_modulemaps".format(name),
         expected_files = [
-            "/test/fixtures/private_deps/public_cc.swift.modulemap",
-            "-/test/fixtures/private_deps/private_cc.swift.modulemap",
+            "/test/fixtures/private_deps/public_cc.modulemaps/module.modulemap",
+            "-/test/fixtures/private_deps/private_cc.modulemaps/module.modulemap",
         ],
         field = "transitive_modules.clang!.module_map",
         provider = "SwiftInfo",