Browse Source

Merge test_objc_grpc_library into local_... with a testing BOOL flag

Tony Lu 6 years ago
parent
commit
de6d4978e0
2 changed files with 12 additions and 61 deletions
  1. 8 58
      src/objective-c/grpc_objc_internal_library.bzl
  2. 4 3
      src/objective-c/tests/BUILD

+ 8 - 58
src/objective-c/grpc_objc_internal_library.bzl

@@ -73,7 +73,7 @@ def grpc_objc_testing_library(
         deps = deps + additional_deps,
         deps = deps + additional_deps,
     )
     )
 
 
-def local_objc_grpc_library(name, deps, srcs = [], use_well_known_protos = False, **kwargs):
+def local_objc_grpc_library(name, deps, testing = True, srcs = [], use_well_known_protos = False, **kwargs):
     """!!For local targets within the gRPC repository only!! Will not work outside of the repo
     """!!For local targets within the gRPC repository only!! Will not work outside of the repo
     """
     """
     objc_grpc_library_name = "_" + name + "_objc_grpc_library"
     objc_grpc_library_name = "_" + name + "_objc_grpc_library"
@@ -104,55 +104,11 @@ def local_objc_grpc_library(name, deps, srcs = [], use_well_known_protos = False
         )
         )
         arc_srcs = [":" + objc_grpc_library_name + "_srcs"]
         arc_srcs = [":" + objc_grpc_library_name + "_srcs"]
 
 
-    native.objc_library(
-        name = name,
-        hdrs = [":" + objc_grpc_library_name + "_hdrs"],
-        non_arc_srcs = [":" + objc_grpc_library_name + "_non_arc_srcs"],
-        srcs = arc_srcs,
-        defines = [
-            "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=0",
-            "GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO=0",
-        ],
-        includes = [
-            "_generated_protos",
-            "src/objective-c",
-        ],
-        deps = [
-            "//src/objective-c:proto_objc_rpc",
-            "@com_google_protobuf//:protobuf_objc",
-        ],
-    )
-
-def testing_objc_grpc_library(name, deps, srcs = [], use_well_known_protos = False, **kwargs):
-    """!!For testing within the gRPC repository only!! Will not work outside of the repo
-    """
-    objc_grpc_library_name = "_" + name + "_objc_grpc_library"
-
-    generate_objc(
-        name = objc_grpc_library_name,
-        srcs = srcs,
-        deps = deps,
-        use_well_known_protos = use_well_known_protos,
-        **kwargs
-    )
-
-    generate_objc_hdrs(
-        name = objc_grpc_library_name + "_hdrs",
-        src = ":" + objc_grpc_library_name,
-    )
-
-    generate_objc_non_arc_srcs(
-        name = objc_grpc_library_name + "_non_arc_srcs",
-        src = ":" + objc_grpc_library_name,
-    )
-
-    arc_srcs = None
-    if len(srcs) > 0:
-        generate_objc_srcs(
-            name = objc_grpc_library_name + "_srcs",
-            src = ":" + objc_grpc_library_name,
-        )
-        arc_srcs = [":" + objc_grpc_library_name + "_srcs"]
+    library_deps = ["@com_google_protobuf//:protobuf_objc"]
+    if testing:
+        library_deps += ["//src/objective-c:grpc_objc_client_internal_testing"]
+    else:
+        library_deps += ["//src/objective-c:proto_objc_rpc"]
 
 
     native.objc_library(
     native.objc_library(
         name = name,
         name = name,
@@ -163,12 +119,6 @@ def testing_objc_grpc_library(name, deps, srcs = [], use_well_known_protos = Fal
             "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=0",
             "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=0",
             "GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO=0",
             "GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO=0",
         ],
         ],
-        includes = [
-            "_generated_protos",
-            "src/objective-c",
-        ],
-        deps = [
-            "//src/objective-c:grpc_objc_client_internal_testing",
-            "@com_google_protobuf//:protobuf_objc",
-        ],
+        includes = ["_generated_protos"],
+        deps = library_deps,
     )
     )

+ 4 - 3
src/objective-c/tests/BUILD

@@ -21,7 +21,7 @@ package(default_visibility = ["//visibility:private"])
 load(
 load(
     "//src/objective-c:grpc_objc_internal_library.bzl",
     "//src/objective-c:grpc_objc_internal_library.bzl",
     "grpc_objc_testing_library",
     "grpc_objc_testing_library",
-    "testing_objc_grpc_library"
+    "local_objc_grpc_library"
 )
 )
 load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test")
@@ -41,10 +41,11 @@ proto_library(
     deps = [":messages_proto"],
     deps = [":messages_proto"],
 )
 )
 
 
-testing_objc_grpc_library(
+local_objc_grpc_library(
     name = "RemoteTest",
     name = "RemoteTest",
     srcs = ["RemoteTestClient/test.proto"],
     srcs = ["RemoteTestClient/test.proto"],
     use_well_known_protos = True,
     use_well_known_protos = True,
+    testing = True,
     deps = [":test_proto"],
     deps = [":test_proto"],
 )
 )
 
 
@@ -232,4 +233,4 @@ tvos_unit_test(
         ":InteropTestsLocalCleartext-lib",
         ":InteropTestsLocalCleartext-lib",
     ],
     ],
     test_host = ":tvos-host",
     test_host = ":tvos-host",
-)
+)