From ad708556dd95e204c4ab6242d42e3e665e78b713 Mon Sep 17 00:00:00 2001 From: thomasvl Date: Fri, 18 Jan 2019 15:13:46 -0500 Subject: [PATCH] Bazel trips up on visibility with @repository references. Avoiding https://github.com/bazelbuild/bazel/issues/7180 RELNOTES: None PiperOrigin-RevId: 229971482 --- BUILD | 4 ++-- examples/apple/objc_interop/BUILD | 2 +- examples/xplatform/c_from_swift/BUILD | 2 +- examples/xplatform/dispatch/BUILD | 2 +- examples/xplatform/hello_world/BUILD | 2 +- examples/xplatform/proto/BUILD | 2 +- examples/xplatform/xctest/BUILD | 2 +- swift/BUILD | 2 +- swift/internal/BUILD | 2 +- tools/BUILD | 4 ++-- tools/mkdir_and_run/BUILD | 2 +- tools/wrappers/BUILD | 2 +- tools/xctest_runner/BUILD | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/BUILD b/BUILD index 5161e9e93..1f684e0fc 100644 --- a/BUILD +++ b/BUILD @@ -10,7 +10,7 @@ filegroup( testonly = 1, srcs = [ "WORKSPACE", - "@build_bazel_rules_swift//swift:for_bazel_tests", - "@build_bazel_rules_swift//tools:for_bazel_tests", + "//swift:for_bazel_tests", + "//tools:for_bazel_tests", ], ) diff --git a/examples/apple/objc_interop/BUILD b/examples/apple/objc_interop/BUILD index 1e1d6bed2..8446e15f7 100644 --- a/examples/apple/objc_interop/BUILD +++ b/examples/apple/objc_interop/BUILD @@ -3,7 +3,7 @@ # platforms. load( - "@build_bazel_rules_swift//swift:swift.bzl", + "//swift:swift.bzl", "swift_binary", "swift_library", ) diff --git a/examples/xplatform/c_from_swift/BUILD b/examples/xplatform/c_from_swift/BUILD index f7d1d3fc3..eadf2ae84 100644 --- a/examples/xplatform/c_from_swift/BUILD +++ b/examples/xplatform/c_from_swift/BUILD @@ -1,4 +1,4 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary", "swift_library") +load("//swift:swift.bzl", "swift_binary", "swift_library") licenses(["notice"]) diff --git a/examples/xplatform/dispatch/BUILD b/examples/xplatform/dispatch/BUILD index 73b51e2a1..bb7637e46 100644 --- a/examples/xplatform/dispatch/BUILD +++ b/examples/xplatform/dispatch/BUILD @@ -1,4 +1,4 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary") +load("//swift:swift.bzl", "swift_binary") licenses(["notice"]) diff --git a/examples/xplatform/hello_world/BUILD b/examples/xplatform/hello_world/BUILD index ccef133c1..51335b4e4 100644 --- a/examples/xplatform/hello_world/BUILD +++ b/examples/xplatform/hello_world/BUILD @@ -1,4 +1,4 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary") +load("//swift:swift.bzl", "swift_binary") licenses(["notice"]) diff --git a/examples/xplatform/proto/BUILD b/examples/xplatform/proto/BUILD index d9fec3964..d9ec89417 100644 --- a/examples/xplatform/proto/BUILD +++ b/examples/xplatform/proto/BUILD @@ -1,5 +1,5 @@ load( - "@build_bazel_rules_swift//swift:swift.bzl", + "//swift:swift.bzl", "swift_binary", "swift_proto_library", ) diff --git a/examples/xplatform/xctest/BUILD b/examples/xplatform/xctest/BUILD index 86ef026e4..5a2b6af9a 100644 --- a/examples/xplatform/xctest/BUILD +++ b/examples/xplatform/xctest/BUILD @@ -1,4 +1,4 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_test") +load("//swift:swift.bzl", "swift_test") licenses(["notice"]) diff --git a/swift/BUILD b/swift/BUILD index 73c777421..278d1cc9f 100644 --- a/swift/BUILD +++ b/swift/BUILD @@ -11,7 +11,7 @@ filegroup( name = "for_bazel_tests", testonly = 1, srcs = glob(["**"]) + [ - "@build_bazel_rules_swift//swift/internal:for_bazel_tests", + "//swift/internal:for_bazel_tests", ], visibility = [ "//:__pkg__", diff --git a/swift/internal/BUILD b/swift/internal/BUILD index 634e62af8..33687e049 100644 --- a/swift/internal/BUILD +++ b/swift/internal/BUILD @@ -13,6 +13,6 @@ filegroup( "@bazel_tools//tools/build_defs/cc:action_names_test_files", ], visibility = [ - "@build_bazel_rules_swift//swift:__pkg__", + "//swift:__pkg__", ], ) diff --git a/tools/BUILD b/tools/BUILD index e7426fd24..41e317b29 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -7,8 +7,8 @@ filegroup( name = "for_bazel_tests", testonly = 1, srcs = glob(["**"]) + [ - "@build_bazel_rules_swift//tools/mkdir_and_run:for_bazel_tests", - "@build_bazel_rules_swift//tools/wrappers:for_bazel_tests", + "//tools/mkdir_and_run:for_bazel_tests", + "//tools/wrappers:for_bazel_tests", ], visibility = [ "//:__pkg__", diff --git a/tools/mkdir_and_run/BUILD b/tools/mkdir_and_run/BUILD index 384a415b2..b67dd95db 100644 --- a/tools/mkdir_and_run/BUILD +++ b/tools/mkdir_and_run/BUILD @@ -12,6 +12,6 @@ filegroup( testonly = 1, srcs = glob(["**"]), visibility = [ - "@build_bazel_rules_swift//tools:__pkg__", + "//tools:__pkg__", ], ) diff --git a/tools/wrappers/BUILD b/tools/wrappers/BUILD index 03eb3a4e6..8931c6e78 100644 --- a/tools/wrappers/BUILD +++ b/tools/wrappers/BUILD @@ -18,6 +18,6 @@ filegroup( testonly = 1, srcs = glob(["**"]), visibility = [ - "@build_bazel_rules_swift//tools:__pkg__", + "//tools:__pkg__", ], ) diff --git a/tools/xctest_runner/BUILD b/tools/xctest_runner/BUILD index e900978f3..a080c97b1 100644 --- a/tools/xctest_runner/BUILD +++ b/tools/xctest_runner/BUILD @@ -12,6 +12,6 @@ filegroup( testonly = 1, srcs = glob(["**"]), visibility = [ - "@build_bazel_rules_swift//tools:__pkg__", + "//tools:__pkg__", ], )