diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-20 19:53:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 19:53:31 +0000 |
commit | 8306b6e2f7f83b22674576e66abcc53d6af47f1f (patch) | |
tree | 45097a03c0e0f3c208f4d13cecbfcc05e7705ee7 | |
parent | abcc5a2a978d4b3866749e1649e48e58b6b82b65 (diff) | |
parent | ee219e51ca0a3e6f789edd422504bc73e28f14ba (diff) | |
download | bazel-8306b6e2f7f83b22674576e66abcc53d6af47f1f.tar.gz |
Merge "Move rules_java to bazel_common_rules" am: ec45c46c7d am: ee219e51ca
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2547130
Change-Id: I106713f79a502d3279b58ddc8c0a878812a28b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | bazel.WORKSPACE | 2 | ||||
-rw-r--r-- | rules/java/rules_java/BUILD | 0 | ||||
-rw-r--r-- | rules/java/rules_java/WORKSPACE | 0 | ||||
-rw-r--r-- | rules/java/rules_java/java/BUILD | 7 | ||||
-rw-r--r-- | rules/java/rules_java/java/defs.bzl | 29 |
5 files changed, 1 insertions, 37 deletions
diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE index d0fe5d7b..dc96892f 100644 --- a/bazel.WORKSPACE +++ b/bazel.WORKSPACE @@ -131,7 +131,7 @@ local_repository( # it can be properly vendored. local_repository( name = "rules_java", - path = "build/bazel/rules/java/rules_java", + path = "build/bazel_common_rules/rules/java/rules_java", ) register_toolchains( diff --git a/rules/java/rules_java/BUILD b/rules/java/rules_java/BUILD deleted file mode 100644 index e69de29b..00000000 --- a/rules/java/rules_java/BUILD +++ /dev/null diff --git a/rules/java/rules_java/WORKSPACE b/rules/java/rules_java/WORKSPACE deleted file mode 100644 index e69de29b..00000000 --- a/rules/java/rules_java/WORKSPACE +++ /dev/null diff --git a/rules/java/rules_java/java/BUILD b/rules/java/rules_java/java/BUILD deleted file mode 100644 index ee5ee6b2..00000000 --- a/rules/java/rules_java/java/BUILD +++ /dev/null @@ -1,7 +0,0 @@ -load("@bazel_skylib//:bzl_library.bzl", "bzl_library") - -bzl_library( - name = "rules", - srcs = ["defs.bzl"], - visibility = ["//visibility:public"], -) diff --git a/rules/java/rules_java/java/defs.bzl b/rules/java/rules_java/java/defs.bzl deleted file mode 100644 index 5c9ec57d..00000000 --- a/rules/java/rules_java/java/defs.bzl +++ /dev/null @@ -1,29 +0,0 @@ -def java_binary(**attrs): - native.java_binary(**attrs) - -def java_import(**attrs): - native.java_import(**attrs) - -def java_library(**attrs): - native.java_library(**attrs) - -def java_lite_proto_library(**attrs): - native.java_lite_proto_library(**attrs) - -def java_proto_library(**attrs): - native.java_proto_library(**attrs) - -def java_test(**attrs): - native.java_test(**attrs) - -def java_package_configuration(**attrs): - native.java_package_configuration(**attrs) - -def java_plugin(**attrs): - native.java_plugin(**attrs) - -def java_runtime(**attrs): - native.java_runtime(**attrs) - -def java_toolchain(**attrs): - native.java_toolchain(**attrs) |