Merge pull request #2 from Enflick/no-module-mapping-even-for-public

Never generate module mappings so everything is contained in one
Enflick · Jan 28, 2021 · 71c26ec · 71c26ec
2 parents db16cd8 + 0cb28f1
commit 71c26ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/swift/internal/swift_grpc_library.bzl b/swift/internal/swift_grpc_library.bzl
@@ -140,11 +140,11 @@ def _register_grpcswift_generate_action(
         extra_module_imports,
         format_each = "--swiftgrpc_opt=ExtraModuleImports=%s",
     )
-    if module_mapping_file and proto_visibility != "Internal":
-        protoc_args.add(
-            module_mapping_file,
-            format = "--swiftgrpc_opt=ProtoPathModuleMappings=%s",
-        )
+    #if module_mapping_file and proto_visibility != "Internal":
+    #    protoc_args.add(
+    #        module_mapping_file,
+    #        format = "--swiftgrpc_opt=ProtoPathModuleMappings=%s",
+    #    )
     protoc_args.add("--descriptor_set_in")
     protoc_args.add_joined(transitive_descriptor_sets, join_with = ":")
     protoc_args.add_all([

diff --git a/swift/internal/swift_protoc_gen_aspect.bzl b/swift/internal/swift_protoc_gen_aspect.bzl
@@ -176,11 +176,11 @@ def _register_pbswift_generate_action(
     else:
         protoc_args.add("--swift_opt=Visibility=Public")
 
-    if module_mapping_file and proto_visibility != "Internal":
-        protoc_args.add(
-            module_mapping_file,
-            format = "--swift_opt=ProtoPathModuleMappings=%s",
-        )
+    #if module_mapping_file and proto_visibility != "Internal":
+    #    protoc_args.add(
+    #        module_mapping_file,
+    #        format = "--swift_opt=ProtoPathModuleMappings=%s",
+    #    )
     protoc_args.add("--descriptor_set_in")
     protoc_args.add_joined(transitive_descriptor_sets, join_with = ":")
     protoc_args.add_all(