bazel: remove rules_java and rules_cc references

Both of these projects are stalled on the bazel side, and these just pass through to the native rules anyways. I'm removing rules_cc from envoy as well envoyproxy/envoy#19760 so this mirrors that. Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
envoyproxy · Apr 26, 2022 · cedda56 · cedda56
1 parent 8d95ef1
commit cedda56
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 16 deletions.
diff --git a/bazel/android_artifacts.bzl b/bazel/android_artifacts.bzl
@@ -1,6 +1,4 @@
 load("@envoy_mobile//bazel:dokka.bzl", "sources_javadocs")
-load("@rules_java//java:defs.bzl", "java_binary")
-load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@google_bazel_common//tools/maven:pom_file.bzl", "pom_file")
 
 # This file is based on https://github.com/aj-michael/aar_with_jni which is
@@ -202,7 +200,7 @@ def _create_jni_library(name, native_deps = []):
     # We wrap our native so dependencies in a cc_library because android_binaries
     # require a library target as dependencies in order to generate the appropriate
     # architectures in the directory `lib/`
-    cc_library(
+    native.cc_library(
         name = cc_lib_name,
         srcs = native_deps,
     )
@@ -261,7 +259,7 @@ def _create_sources_javadocs(name, android_library):
     _javadocs_name = name + "_android_javadocs"
 
     # This implicitly outputs {name}_deploy-src.jar which is the sources jar
-    java_binary(
+    native.java_binary(
         name = _sources_name,
         runtime_deps = [android_library],
         main_class = "EngineImpl",

diff --git a/bazel/apple_test.bzl b/bazel/apple_test.bzl
@@ -1,6 +1,5 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
-load("@rules_cc//cc:defs.bzl", "objc_library")
 load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 
 # Macro providing a way to easily/consistently define Swift unit test targets.

diff --git a/examples/objective-c/hello_world/BUILD b/examples/objective-c/hello_world/BUILD
@@ -1,5 +1,4 @@
 load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
-load("@rules_cc//cc:defs.bzl", "objc_library")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 
 licenses(["notice"])  # Apache 2

diff --git a/library/common/jni/BUILD b/library/common/jni/BUILD
@@ -1,6 +1,5 @@
 load("//bazel:kotlin_lib.bzl", "envoy_mobile_so_to_jni_lib")
 load("//bazel:android_debug_info.bzl", "android_debug_info")
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
 load("//bazel:envoy_mobile_test_extensions.bzl", "TEST_EXTENSIONS")
 

diff --git a/library/common/jni/import/BUILD b/library/common/jni/import/BUILD
@@ -1,4 +1,3 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
 
 licenses(["notice"])  # Apache 2

diff --git a/library/java/io/envoyproxy/envoymobile/engine/BUILD b/library/java/io/envoyproxy/envoymobile/engine/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
 licenses(["notice"])  # Apache 2
 
 android_library(

diff --git a/library/java/io/envoyproxy/envoymobile/engine/types/BUILD b/library/java/io/envoyproxy/envoymobile/engine/types/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
 licenses(["notice"])  # Apache 2
 
 java_library(

diff --git a/library/objective-c/BUILD b/library/objective-c/BUILD
@@ -1,5 +1,3 @@
-load("@rules_cc//cc:defs.bzl", "objc_library")
-
 licenses(["notice"])  # Apache 2
 
 exports_files([

diff --git a/test/common/jni/BUILD b/test/common/jni/BUILD
@@ -1,5 +1,4 @@
 load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
-load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//bazel:kotlin_lib.bzl", "envoy_mobile_so_to_jni_lib")
 
 licenses(["notice"])  # Apache 2

diff --git a/third_party/rbe_configs/cc/BUILD b/third_party/rbe_configs/cc/BUILD
@@ -16,7 +16,6 @@
 
 load(":cc_toolchain_config.bzl", "cc_toolchain_config")
 load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
-load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
 
 package(default_visibility = ["//visibility:public"])