aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar cushon <cushon@google.com>2018-08-07 10:08:32 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-08-07 10:10:05 -0700
commitd3134f5b68c3811ba4d089d07f54bd9095a3ef12 (patch)
tree7af623ccc2cd17797d93d8872959d914eddc821b
parent77801e3cb747010edf573eb6639460589318f943 (diff)
Remove uses of java_toolchain.encoding
PiperOrigin-RevId: 207734653
-rw-r--r--src/java_tools/buildjar/BUILD1
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/LicensingTests.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java1
-rw-r--r--tools/jdk/default_java_toolchain.bzl1
4 files changed, 0 insertions, 4 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 32d8852803..4a3a5f09e6 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -78,7 +78,6 @@ java_toolchain(
# single jar that contains the contents of both the bootclasspath and
# extdirs.
bootclasspath = ["//tools/jdk:platformclasspath-impl.jar"],
- encoding = "UTF-8",
extclasspath = [],
genclass = ["bootstrap_genclass_deploy.jar"],
ijar = ["//third_party/ijar"],
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LicensingTests.java b/src/test/java/com/google/devtools/build/lib/analysis/LicensingTests.java
index 3a6c67183a..c555efb3de 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LicensingTests.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LicensingTests.java
@@ -626,7 +626,6 @@ public class LicensingTests extends BuildViewTestCase {
" name = 'toolchain',",
" licenses = ['restricted'],",
" output_licenses = ['unencumbered'],",
- " encoding = 'UTF-8',",
" source_version = '8',",
" target_version = '8',",
" bootclasspath = [':bcp'],",
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
index f93d93612b..6a966a51df 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
@@ -145,7 +145,6 @@ public abstract class FoundationTestCase {
" target_version = '6',",
" bootclasspath = ['rt.jar'],",
" extclasspath = ['ext/lib.jar'],",
- " encoding = 'ISO-8859-1',",
" xlint = ['toto'],",
" misc = ['-Xmaxerrs 500'],",
" compatible_javacopts = {",
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index db5e3e8616..5d7c8be0eb 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -59,7 +59,6 @@ COMPATIBLE_JAVACOPTS = {
}
DEFAULT_TOOLCHAIN_CONFIGURATION = {
- "encoding": "UTF-8",
"forcibly_disable_header_compilation": 0,
"genclass": ["@bazel_tools//tools/jdk:genclass"],
"header_compiler": ["@bazel_tools//tools/jdk:turbine"],