diff --git a/bazel/BUILD b/bazel/BUILD index 3534ccb78..03edbdf27 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -1,4 +1,5 @@ load("@rules_java//java:defs.bzl", "java_binary") +load("//third_party/bazel_rules/rules_cc/cc:cc_binary.bzl", "cc_binary") java_binary( name = "antlr4_tool", diff --git a/bazel/antlr.bzl b/bazel/antlr.bzl index 42fa506f7..46dfef7b7 100644 --- a/bazel/antlr.bzl +++ b/bazel/antlr.bzl @@ -16,6 +16,8 @@ Generate C++ parser and lexer from a grammar file. """ +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") + def antlr_cc_library(name, src, package): """Creates a C++ lexer and parser from a source grammar. Args: @@ -29,7 +31,7 @@ def antlr_cc_library(name, src, package): src = src, package = package, ) - native.cc_library( + cc_library( name = name + "_cc_parser", srcs = [generated], deps = [ diff --git a/conformance/BUILD b/conformance/BUILD index 95353e1c2..0a00ea7a1 100644 --- a/conformance/BUILD +++ b/conformance/BUILD @@ -13,6 +13,7 @@ # limitations under the License. load("//conformance:run.bzl", "gen_conformance_tests") +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) diff --git a/conformance/run.bzl b/conformance/run.bzl index 86fc01ace..89111bf7a 100644 --- a/conformance/run.bzl +++ b/conformance/run.bzl @@ -16,6 +16,8 @@ This module contains build rules for generating the conformance test targets. """ +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + # Converts the list of tests to skip from the format used by the original Go test runner to a single # flag value where each test is separated by a comma. It also performs expansion, for example # `foo/bar,baz` becomes two entries which are `foo/bar` and `foo/baz`. @@ -62,7 +64,7 @@ def _conformance_test_args(modern, optimize, recursive, skip_check, skip_tests, return args def _conformance_test(name, data, modern, optimize, recursive, skip_check, skip_tests, tags, dashboard): - native.cc_test( + cc_test( name = _conformance_test_name(name, optimize, recursive), args = _conformance_test_args(modern, optimize, recursive, skip_check, skip_tests, dashboard) + ["$(location " + test + ")" for test in data], data = data, diff --git a/eval/compiler/BUILD b/eval/compiler/BUILD index 7156807a7..3a3871c99 100644 --- a/eval/compiler/BUILD +++ b/eval/compiler/BUILD @@ -1,3 +1,6 @@ +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + DEFAULT_VISIBILITY = [ "//eval:__subpackages__", "//runtime:__subpackages__", diff --git a/eval/eval/BUILD b/eval/eval/BUILD index e38c043b2..4d8ffdbb9 100644 --- a/eval/eval/BUILD +++ b/eval/eval/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + # This package contains implementation of expression evaluator # internals. package(default_visibility = ["//visibility:public"]) diff --git a/eval/internal/BUILD b/eval/internal/BUILD index 1e845a1a2..8c08028d1 100644 --- a/eval/internal/BUILD +++ b/eval/internal/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/eval/public/BUILD b/eval/public/BUILD index d02b165bb..b26c36dbd 100644 --- a/eval/public/BUILD +++ b/eval/public/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) package_group( diff --git a/eval/public/containers/BUILD b/eval/public/containers/BUILD index a4e74e70e..6a4ade232 100644 --- a/eval/public/containers/BUILD +++ b/eval/public/containers/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/eval/public/structs/BUILD b/eval/public/structs/BUILD index 83fa4b42c..1aea27f37 100644 --- a/eval/public/structs/BUILD +++ b/eval/public/structs/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/eval/public/testing/BUILD b/eval/public/testing/BUILD index b2b53fff2..adbdb05fd 100644 --- a/eval/public/testing/BUILD +++ b/eval/public/testing/BUILD @@ -1,3 +1,6 @@ +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package( default_testonly = True, default_visibility = ["//visibility:public"], diff --git a/eval/tests/BUILD b/eval/tests/BUILD index c98c02206..c4a470cbc 100644 --- a/eval/tests/BUILD +++ b/eval/tests/BUILD @@ -4,6 +4,8 @@ load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") package(default_visibility = ["//visibility:public"]) diff --git a/testutil/BUILD b/testutil/BUILD index 0d2bfd63c..87b2ff7af 100644 --- a/testutil/BUILD +++ b/testutil/BUILD @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/tools/BUILD b/tools/BUILD index 896d930e4..b3bd37369 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -1,3 +1,6 @@ +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") +load("//third_party/bazel_rules/rules_cc/cc:cc_test.bzl", "cc_test") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/tools/internal/BUILD b/tools/internal/BUILD index 79b379ed9..e7c9bf9c5 100644 --- a/tools/internal/BUILD +++ b/tools/internal/BUILD @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) diff --git a/tools/testdata/BUILD b/tools/testdata/BUILD index 5c48819c8..66c2965db 100644 --- a/tools/testdata/BUILD +++ b/tools/testdata/BUILD @@ -16,6 +16,7 @@ load( "@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_library_public", ) +load("//third_party/bazel_rules/rules_cc/cc:cc_library.bzl", "cc_library") licenses(["notice"])