From 947c7b7216d638ba5f7435c64500ede9b2690003 Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Tue, 5 Nov 2019 11:10:16 -0800
Subject: [PATCH] Resolve conflict with master branch

---
 test/core/tsi/alts/crypt/BUILD                     | 14 ++++----------
 .../objective_c/google_toolbox_for_mac/BUILD       |  4 ++--
 third_party/py/python_configure.bzl                |  3 ++-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/test/core/tsi/alts/crypt/BUILD b/test/core/tsi/alts/crypt/BUILD
index f1c7d435be2..767368a2f80 100644
--- a/test/core/tsi/alts/crypt/BUILD
+++ b/test/core/tsi/alts/crypt/BUILD
@@ -34,16 +34,10 @@ grpc_cc_test(
     ],
 )
 
-grpc_cc_test(
-    name = "memory_usage_test",
-    srcs = ["memory_usage_test.cc"],
-    data = [
-        ":memory_usage_client",
-        ":memory_usage_server",
-    ],
-    language = "C++",
-    tags = ["no_windows"],  # TODO(jtattermusch): breaks windows RBE build if enabled
-    uses_polling = False,
+grpc_cc_library(
+    name = "alts_crypt_test_util",
+    srcs = ["gsec_test_util.cc"],
+    hdrs = ["gsec_test_util.h"],
     deps = [
         "//:gpr",
         "//:grpc",
diff --git a/third_party/objective_c/google_toolbox_for_mac/BUILD b/third_party/objective_c/google_toolbox_for_mac/BUILD
index f1c74346211..b801cbc6b85 100644
--- a/third_party/objective_c/google_toolbox_for_mac/BUILD
+++ b/third_party/objective_c/google_toolbox_for_mac/BUILD
@@ -16,14 +16,14 @@
 
 licenses(["notice"])
 
-native.objc_library(
+objc_library(
     name = "GTM_GoogleTestRunner_GTM_USING_XCTEST",
     testonly = 1,
     srcs = [
         "UnitTesting/GTMGoogleTestRunner.mm",
     ],
+    visibility = ["//visibility:public"],
     deps = [
         "//external:gtest",
     ],
-    visibility = ["//visibility:public"],
 )
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index 3cd8301935d..e68220f470f 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -277,9 +277,10 @@ def _create_single_version_package(
     # See https://docs.python.org/3/extending/windows.html
     if _is_windows(repository_ctx):
         python_include = _normalize_path(python_include)
-        python_import_lib_name = _get_python_import_lib_name, bin_path_key(
+        python_import_lib_name = _get_python_import_lib_name(
             repository_ctx,
             python_bin,
+            bin_path_key,
         )
         python_import_lib_src = python_include.rsplit(
             "/",