aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Meumertzheim <fabian@meumertzhe.im>2021-10-08 16:38:51 +0200
committerFabian Meumertzheim <fabian@meumertzhe.im>2021-10-15 10:11:09 +0200
commitf01953a229058995caa1486b20ca66824c1c2235 (patch)
treee3c4d10c1062cf114a0e29537d0bc5250a492821
parent3cf96185bd1f208ce03350b5288f42788526b6fb (diff)
downloadjazzer-api-f01953a229058995caa1486b20ca66824c1c2235.tar.gz
Do not use @rules_java and @rules_cc
These repositories are no longer how starlarkified rules will be published in the near future.
-rw-r--r--agent/BUILD.bazel1
-rw-r--r--agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel1
-rw-r--r--agent/src/main/java/com/code_intelligence/jazzer/generated/BUILD.bazel1
-rw-r--r--bazel/cc.bzl6
-rw-r--r--bazel/fuzz_target.bzl4
-rw-r--r--driver/BUILD.bazel1
-rw-r--r--driver/testdata/BUILD.bazel2
-rw-r--r--examples/BUILD.bazel1
-rw-r--r--sanitizers/BUILD.bazel2
-rw-r--r--sanitizers/src/main/java/jaz/BUILD.bazel2
-rw-r--r--third_party/classgraph.BUILD2
11 files changed, 3 insertions, 20 deletions
diff --git a/agent/BUILD.bazel b/agent/BUILD.bazel
index f84004c5..ddafc246 100644
--- a/agent/BUILD.bazel
+++ b/agent/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
load("@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl", "jar_jar")
load("//sanitizers:sanitizers.bzl", "SANITIZER_CLASSES")
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
index 78c86c34..8a8e0239 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
load("@bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
load("@rules_jvm_external//:defs.bzl", "java_export")
load("//:maven.bzl", "JAZZER_API_COORDINATES")
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/generated/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/generated/BUILD.bazel
index 4347919e..339ab577 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/generated/BUILD.bazel
+++ b/agent/src/main/java/com/code_intelligence/jazzer/generated/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
java_binary(
diff --git a/bazel/cc.bzl b/bazel/cc.bzl
index 51083190..e5c306d2 100644
--- a/bazel/cc.bzl
+++ b/bazel/cc.bzl
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-
def _add_cxxopt_std_17_impl(settings, attr):
return {
"//command_line_option:cxxopt": settings["//command_line_option:cxxopt"] + ["-std=c++17"],
@@ -77,7 +75,7 @@ def cc_17_library(name, visibility = None, **kwargs):
def cc_shared_library(name, visibility = None, **kwargs):
# Linux
linux_name = "lib%s.so" % name
- cc_binary(
+ native.cc_binary(
name = linux_name,
linkshared = True,
visibility = visibility,
@@ -86,7 +84,7 @@ def cc_shared_library(name, visibility = None, **kwargs):
# macOS
osx_name = "lib%s.dylib" % name
- cc_binary(
+ native.cc_binary(
name = osx_name,
linkshared = True,
visibility = visibility,
diff --git a/bazel/fuzz_target.bzl b/bazel/fuzz_target.bzl
index fa493b51..801fa292 100644
--- a/bazel/fuzz_target.bzl
+++ b/bazel/fuzz_target.bzl
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@rules_java//java:defs.bzl", "java_binary")
-
def java_fuzz_target_test(
name,
target_class,
@@ -36,7 +34,7 @@ def java_fuzz_target_test(
# Deps can only be specified on java_binary targets with sources, which
# excludes e.g. Kotlin libraries wrapped into java_binary via runtime_deps.
target_deps = deps + ["//agent:jazzer_api_compile_only"] if srcs else []
- java_binary(
+ native.java_binary(
name = target_name,
srcs = srcs,
visibility = ["//visibility:private"],
diff --git a/driver/BUILD.bazel b/driver/BUILD.bazel
index 905289e6..d9501505 100644
--- a/driver/BUILD.bazel
+++ b/driver/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
load("//bazel:cc.bzl", "cc_17_library")
# None of the targets in this package should be built into shared objects. By
diff --git a/driver/testdata/BUILD.bazel b/driver/testdata/BUILD.bazel
index 42f7ed07..8dd67e12 100644
--- a/driver/testdata/BUILD.bazel
+++ b/driver/testdata/BUILD.bazel
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
-
java_binary(
name = "fuzz_target_mocks",
srcs = glob(["test/*.java"]),
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 998f42fa..0d900c74 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
load("//bazel:fuzz_target.bzl", "java_fuzz_target_test")
diff --git a/sanitizers/BUILD.bazel b/sanitizers/BUILD.bazel
index 751eca53..fa84208e 100644
--- a/sanitizers/BUILD.bazel
+++ b/sanitizers/BUILD.bazel
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
java_library(
name = "sanitizers",
visibility = ["//visibility:public"],
diff --git a/sanitizers/src/main/java/jaz/BUILD.bazel b/sanitizers/src/main/java/jaz/BUILD.bazel
index 47bade50..81275a31 100644
--- a/sanitizers/src/main/java/jaz/BUILD.bazel
+++ b/sanitizers/src/main/java/jaz/BUILD.bazel
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
java_library(
name = "jaz",
srcs = [
diff --git a/third_party/classgraph.BUILD b/third_party/classgraph.BUILD
index 2d26caa6..ab51f11c 100644
--- a/third_party/classgraph.BUILD
+++ b/third_party/classgraph.BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
java_library(
name = "classgraph",
srcs = glob([