diff options
| author |  cushon <cushon@google.com> | 2018-08-08 08:55:48 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-08 08:57:47 -0700 |
| commit | 3862a807881e423daf88eb47286077e99d4bac08 (patch) | |
| tree | c1706aeb325fbf3fdeb2df19f4dafc2797b8331e /src | |
| parent | c476baa337e94fa8109d3e6ee280a54d5a0cb847 (diff) | |
Remove support for explicitly setting java_toolchain.encoding to UTF-8
PiperOrigin-RevId: 207891979
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java index 2366413fbe..f676b9ca8f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java @@ -82,10 +82,6 @@ public final class JavaToolchainRule<C extends JavaToolchain> implements RuleDef .value(ImmutableList.of()) .cfg(HostTransition.INSTANCE) .allowedFileTypes(FileTypeSet.ANY_FILE)) - /* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(encoding) --> - The encoding of the java files (e.g., 'UTF-8'). - <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ - .add(attr("encoding", STRING)) // javac -encoding flag value. /* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(xlint) --> The list of warning to add or removes from default list. Precedes it with a dash to removes it. Please see the Javac documentation on the -Xlint options for more information. diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 123b58d3ba..801ac17eb7 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -80,7 +80,6 @@ public final class BazelAnalysisMock extends AnalysisMock { "package(default_visibility=['//visibility:public'])", "java_toolchain(", " name = 'toolchain',", - " encoding = 'UTF-8',", " source_version = '8',", " target_version = '8',", " bootclasspath = [':bootclasspath'],", |