diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2016-03-11 23:52:15 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-03-14 13:53:33 +0000 |
| commit | 5d8e0b158c0c709a64c471e03aa6828c32e4c8c9 (patch) | |
| tree | 5c69df487e536b92a29bd70df0466497fd19c1af /src/main/java/com/google/devtools/build/lib | |
| parent | da258a005c47570097d3862722b492d5bd0770c7 (diff) | |
Add a test for getDefaultJavacOptsFromRule
java_toolchain.jvm_opts was being used instead of javac options.
--
MOS_MIGRATED_REVID=117016052
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java index e2c9cd9bbb..53e9fe535f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java @@ -625,9 +625,10 @@ public final class JavaCompilationHelper extends BaseJavaCompilationHelper { * @return a list of options to provide to javac */ private static ImmutableList<String> getDefaultJavacOptsFromRule(RuleContext ruleContext) { - return ImmutableList.copyOf(Iterables.concat( - JavaToolchainProvider.fromRuleContext(ruleContext).getJavacOptions(), - ruleContext.getTokenizedStringListAttr("javacopts"))); + return ImmutableList.copyOf( + Iterables.concat( + JavaToolchainProvider.fromRuleContext(ruleContext).getJavacOptions(), + ruleContext.getTokenizedStringListAttr("javacopts"))); } public void setTranslations(Collection<Artifact> translations) { |