Resolve conflict with master branch

pull/20885/head
Lidi Zheng 5 years ago
parent 921094f738
commit 947c7b7216
  1. 14
      test/core/tsi/alts/crypt/BUILD
  2. 4
      third_party/objective_c/google_toolbox_for_mac/BUILD
  3. 3
      third_party/py/python_configure.bzl

@ -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",

@ -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"],
)

@ -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(
"/",

Loading…
Cancel
Save