Skip to content

Commit

Permalink
Automated rollback of commit 570e25f.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Conflicts with bazelbuild#17762

Will instead go with the alternative idea discussed in this PR: bazelbuild#17767

*** Original change description ***

Add darwin_arm64 java_tools

Build a fat universal binary for java_tools_prebuilt on darwin

Work towards: bazelbuild/java_tools#57 and bazelbuild#13944

Closes bazelbuild#16960.

PiperOrigin-RevId: 516799739
Change-Id: I2ff5f615bd7c23e38a334bf836c31ed964443c31
  • Loading branch information
hvadehra authored and fweikert committed May 25, 2023
1 parent 0a74e53 commit 2504ccc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 107 deletions.
17 changes: 1 addition & 16 deletions src/tools/singlejar/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//src:release_archive.bzl", "release_archive")
load("//third_party/ijar:darwin_universal_binary.bzl", "darwin_universal_binary")

# Description:
# singlejar C++ implementation.
Expand Down Expand Up @@ -65,7 +64,7 @@ release_archive(

release_archive(
name = "singlejar_deploy_zip",
srcs = [":singlejar_local_binary_for_deploy"],
srcs = [":singlejar_local"],
package_dir = "java_tools/src/tools/singlejar",
visibility = ["//src:__pkg__"],
)
Expand All @@ -89,20 +88,6 @@ cc_binary(
],
)

alias(
name = "singlejar_local_binary_for_deploy",
actual = select({
"//src/conditions:darwin": ":singlejar_local_darwin",
"//conditions:default": ":singlejar_local",
}),
)

darwin_universal_binary(
name = "singlejar_local_darwin",
binary = ":singlejar_local",
output_name = "singlejar_local",
)

cc_binary(
name = "singlejar_local",
srcs = [
Expand Down
34 changes: 4 additions & 30 deletions third_party/ijar/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
load(":darwin_universal_binary.bzl", "darwin_universal_binary")

package(
default_visibility = [
"//src:__subpackages__",
Expand Down Expand Up @@ -78,12 +76,6 @@ cc_binary(
deps = [":zip"],
)

darwin_universal_binary(
name = "zipper_darwin",
binary = ":zipper",
output_name = "zipper",
)

cc_binary(
name = "ijar",
srcs = [
Expand All @@ -94,12 +86,6 @@ cc_binary(
deps = [":zip"],
)

darwin_universal_binary(
name = "ijar_darwin",
binary = ":ijar",
output_name = "ijar",
)

filegroup(
name = "srcs",
srcs = glob(["**"]) + ["//third_party/ijar/test:srcs"],
Expand All @@ -119,7 +105,6 @@ filegroup(
"zlib_client.cc",
"zlib_client.h",
"BUILD",
"darwin_universal_binary.bzl",
] + select({
"//src:windows": [
"mapped_file_windows.cc",
Expand Down Expand Up @@ -152,16 +137,10 @@ genrule(

genrule(
name = "ijar_deploy_zip",
srcs = select({
"//src/conditions:darwin": [
":ijar_darwin",
":zipper_darwin",
],
"//conditions:default": [
":ijar",
":zipper",
],
}),
srcs = [
":ijar",
":zipper",
],
outs = ["ijar_deploy.zip"],
cmd = "$(location //src:zip_files) java_tools/ijar $@ $(SRCS)",
tools = ["//src:zip_files"],
Expand All @@ -179,8 +158,3 @@ genrule(
tools = ["//src:zip_files"],
visibility = ["//visibility:private"],
)

exports_files(
["darwin_universal_binary.bzl"],
visibility = ["//src/tools/singlejar:__pkg__"],
)
61 changes: 0 additions & 61 deletions third_party/ijar/darwin_universal_binary.bzl

This file was deleted.

0 comments on commit 2504ccc

Please sign in to comment.