Skip to content

Commit a799e34

Browse files
eustaseustas
authored
Remove dependency to full JDK. This should speedup clean builds. (#719)
* Remove dependency to full JDK. This should speedup clean builds. * Upgrade appveyor bazel
1 parent 7a153eb commit a799e34

File tree

3 files changed

+41
-69
lines changed

3 files changed

+41
-69
lines changed

‎java/BUILD‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ package(
66

77
genrule(
88
name = "copy_link_jni_header",
9-
srcs = ["@openjdk_linux//:jni_h"],
9+
srcs = ["@openjdk_jni_h//file"],
1010
outs = ["jni/jni.h"],
1111
cmd = "cp -f $< $@",
1212
)
1313

1414
genrule(
1515
name = "copy_link_jni_md_header",
1616
srcs = select({
17-
"@org_brotli//:darwin": ["@openjdk_macos//:jni_md_h"],
18-
"@org_brotli//:darwin_x86_64": ["@openjdk_macos//:jni_md_h"],
19-
"@org_brotli//:windows_msys": ["@openjdk_win//:jni_md_h"],
20-
"@org_brotli//:windows_msvc": ["@openjdk_win//:jni_md_h"],
21-
"@org_brotli//:windows": ["@openjdk_win//:jni_md_h"],
22-
"//conditions:default": ["@openjdk_linux//:jni_md_h"],
17+
"@org_brotli//:darwin": ["@openjdk_macosx_jni_md_h//file"],
18+
"@org_brotli//:darwin_x86_64": ["@openjdk_macosx_jni_md_h//file"],
19+
"@org_brotli//:windows_msys": ["@openjdk_windows_jni_md_h//file"],
20+
"@org_brotli//:windows_msvc": ["@openjdk_windows_jni_md_h//file"],
21+
"@org_brotli//:windows": ["@openjdk_windows_jni_md_h//file"],
22+
"//conditions:default": ["@openjdk_solaris_jni_md_h//file"],
2323
}),
2424
outs = ["jni/jni_md.h"],
2525
cmd = "cp -f $< $@",
@@ -42,21 +42,21 @@ cc_library(
4242
cc_binary(
4343
name = "brotli_jni.dll",
4444
srcs = [
45+
"//org/brotli/wrapper/common:jni_src",
46+
"//org/brotli/wrapper/dec:jni_src",
47+
"//org/brotli/wrapper/enc:jni_src",
4548
"@org_brotli//:common_headers",
4649
"@org_brotli//:common_sources",
4750
"@org_brotli//:dec_headers",
4851
"@org_brotli//:dec_sources",
4952
"@org_brotli//:enc_headers",
5053
"@org_brotli//:enc_sources",
51-
"//org/brotli/wrapper/common:jni_src",
52-
"//org/brotli/wrapper/dec:jni_src",
53-
"//org/brotli/wrapper/enc:jni_src",
5454
],
55+
linkshared = 1,
5556
deps = [
56-
"@org_brotli//:brotli_inc",
5757
":jni_inc",
58+
"@org_brotli//:brotli_inc",
5859
],
59-
linkshared = 1,
6060
)
6161

6262
########################################################
@@ -65,22 +65,22 @@ cc_binary(
6565
cc_binary(
6666
name = "brotli_jni_no_dictionary_data.dll",
6767
srcs = [
68+
"//org/brotli/wrapper/common:jni_src",
69+
"//org/brotli/wrapper/dec:jni_src",
70+
"//org/brotli/wrapper/enc:jni_src",
6871
"@org_brotli//:common_headers",
6972
"@org_brotli//:common_sources",
7073
"@org_brotli//:dec_headers",
7174
"@org_brotli//:dec_sources",
7275
"@org_brotli//:enc_headers",
7376
"@org_brotli//:enc_sources",
74-
"//org/brotli/wrapper/common:jni_src",
75-
"//org/brotli/wrapper/dec:jni_src",
76-
"//org/brotli/wrapper/enc:jni_src",
7777
],
7878
defines = [
7979
"BROTLI_EXTERNAL_DICTIONARY_DATA=",
8080
],
81+
linkshared = 1,
8182
deps = [
82-
"@org_brotli//:brotli_inc",
8383
":jni_inc",
84+
"@org_brotli//:brotli_inc",
8485
],
85-
linkshared = 1,
8686
)

‎java/WORKSPACE‎

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,60 +10,32 @@ maven_jar(
1010
artifact = "junit:junit:4.12",
1111
)
1212

13-
new_http_archive(
14-
name = "openjdk_linux",
15-
urls = [
16-
"https://mirror.bazel.build/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-linux_x64.tar.gz",
17-
"https://bazel-mirror.storage.googleapis.com/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-linux_x64.tar.gz",
18-
"https://cdn.azul.com/zulu/bin/zulu8.23.0.3-jdk8.0.144-linux_x64.tar.gz",
19-
],
20-
sha256 = "7e6284739c0e5b7142bc7a9adc61ced70dc5bb26b130b582b18e809013bcb251",
21-
build_file_content = """
22-
package(
23-
default_visibility = ["//visibility:public"],
24-
)
25-
filegroup(
26-
name = "jni_h",
27-
srcs = ["zulu8.23.0.3-jdk8.0.144-linux_x64/include/jni.h"],
28-
)
29-
filegroup(
30-
name = "jni_md_h",
31-
srcs = ["zulu8.23.0.3-jdk8.0.144-linux_x64/include/linux/jni_md.h"],
32-
)""",
33-
)
13+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
3414

35-
new_http_archive(
36-
name = "openjdk_macos",
37-
urls = [
38-
"https://mirror.bazel.build/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-macosx_x64.zip",
39-
"https://bazel-mirror.storage.googleapis.com/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-macosx_x64.zip",
40-
"https://cdn.azul.com/zulu/bin/zulu8.23.0.3-jdk8.0.144-macosx_x64.zip",
41-
],
42-
sha256 = "ff533364c9cbd3b271ab5328efe28e2dd6d7bae5b630098a5683f742ecf0709d",
43-
build_file_content = """
44-
package(
45-
default_visibility = ["//visibility:public"],
15+
http_file(
16+
name = "openjdk_jni_h",
17+
downloaded_file_path = "jni.h",
18+
urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/share/javavm/export/jni.h"],
19+
sha256 = "ed99792df48670072b78028faf704a8dcb6868fe140ccc7eced9b01dfa62fef4",
4620
)
47-
filegroup(
48-
name = "jni_md_h",
49-
srcs = ["zulu8.23.0.3-jdk8.0.144-macosx_x64/include/darwin/jni_md.h"],
50-
)""",
21+
22+
http_file(
23+
name = "openjdk_solaris_jni_md_h",
24+
downloaded_file_path = "jni_md.h",
25+
urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/solaris/javavm/export/jni_md.h"],
26+
sha256 = "ecbe6944fe1a4290644d5a6b3c8f68576798a53b9da12cd31c58c48569595ff7",
5127
)
5228

53-
new_http_archive(
54-
name = "openjdk_win",
55-
urls = [
56-
"https://mirror.bazel.build/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-win_x64.zip",
57-
"https://bazel-mirror.storage.googleapis.com/openjdk/azul-zulu-8.23.0.3-jdk8.0.144/zulu8.23.0.3-jdk8.0.144-win_x64.zip",
58-
"https://cdn.azul.com/zulu/bin/zulu8.23.0.3-jdk8.0.144-win_x64.zip",
59-
],
60-
sha256 = "f1d9d3341ef7c8c9baff3597953e99a6a7c64f8608ee62c03fdd7574b7655c02",
61-
build_file_content = """
62-
package(
63-
default_visibility = ["//visibility:public"],
29+
http_file(
30+
name = "openjdk_macosx_jni_md_h",
31+
downloaded_file_path = "jni_md.h",
32+
urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/macosx/javavm/export/jni_md.h"],
33+
sha256 = "8f718071022e7e7f2fc9a229984b7e83582db91ed83861b49ce1461436fe8dc4",
6434
)
65-
filegroup(
66-
name = "jni_md_h",
67-
srcs = ["zulu8.23.0.3-jdk8.0.144-win_x64/include/win32/jni_md.h"],
68-
)""",
35+
36+
http_file(
37+
name = "openjdk_windows_jni_md_h",
38+
downloaded_file_path = "jni_md.h",
39+
urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/windows/javavm/export/jni_md.h"],
40+
sha256 = "5479fb385ea1e11619f5c0cdfd9ccb3ea3a3fea0f5bc6176fb3ce62be29d759b",
6941
)

‎scripts/appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ install:
5454
)
5555
)
5656
- IF "%BUILD_SYSTEM%"=="bazel" (
57-
appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.14.1/bazel-0.14.1-windows-x86_64.exe -FileName bazel.exe
57+
appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel-0.18.0-windows-x86_64.exe -FileName bazel.exe
5858
)
5959

6060
before_build:

0 commit comments

Comments
 (0)