Commit 43c7b97 1 parent ce1a5d0 commit 43c7b97 Copy full SHA for 43c7b97
File tree 4 files changed +13
-12
lines changed
src/main/starlark/builtins_bzl/common
4 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -47,9 +47,9 @@ def _get_loose_mode_in_hdrs_check_allowed_attr():
47
47
48
48
def _get_def_parser ():
49
49
return attr .label (
50
- default = "@bazel_tools//tools/def_parser:def_parser" ,
51
- allow_single_file = True ,
52
- cfg = "exec" ,
50
+ default = "@bazel_tools//tools/def_parser:def_parser" ,
51
+ allow_single_file = True ,
52
+ cfg = "exec" ,
53
53
)
54
54
55
55
semantics = struct (
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ def _get_coverage_runner(ctx):
46
46
if not runner :
47
47
fail ("jacocorunner not set in java_toolchain" )
48
48
runner_jar = runner .executable
49
+
49
50
# wrap the jar in JavaInfo so we can add it to deps for java_common.compile()
50
51
return JavaInfo (output_jar = runner_jar , compile_jar = runner_jar )
51
52
Original file line number Diff line number Diff line change @@ -17,15 +17,15 @@ Proto Semantics
17
17
"""
18
18
19
19
def _preprocess (ctx ):
20
- pass
20
+ pass
21
21
22
22
semantics = struct (
23
- PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc" ,
24
- EXTRA_ATTRIBUTES = {
25
- "import_prefix" : attr .string (),
26
- },
27
- EXTRA_FRAGMENTS = [],
28
- preprocess = _preprocess ,
23
+ PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc" ,
24
+ EXTRA_ATTRIBUTES = {
25
+ "import_prefix" : attr .string (),
26
+ },
27
+ EXTRA_FRAGMENTS = [],
28
+ preprocess = _preprocess ,
29
29
# This constant is used in ProtoCompileActionBuilder to generate an error message that's
30
30
# displayed when a strict proto deps violation occurs.
31
31
#
@@ -36,4 +36,4 @@ semantics = struct(
36
36
"--direct_dependencies_violation_msg=" +
37
37
"%%s is imported, but %s doesn't directly depend on a proto_library that 'srcs' it."
38
38
),
39
- )
39
+ )
Original file line number Diff line number Diff line change @@ -24,14 +24,14 @@ BASE_JDK9_JVM_OPTS = [
24
24
"--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" ,
25
25
"--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" ,
26
26
"--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" ,
27
- "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" ,
28
27
"--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" ,
29
28
"--add-exports=jdk.compiler/com.sun.tools.javac.resources=ALL-UNNAMED" ,
30
29
"--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" ,
31
30
"--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" ,
32
31
"--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" ,
33
32
"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" ,
34
33
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" ,
34
+ "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" ,
35
35
36
36
# quiet warnings from com.google.protobuf.UnsafeUtil,
37
37
# see: https://github.com/google/protobuf/issues/3781
You can’t perform that action at this time.
0 commit comments