From 191646d44dc8cf51391f5061fbf08a58e7706a03 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Fri, 29 Jan 2016 20:14:48 +0000 Subject: RELNOTES[INC]: Remove JAVAC "Make" variable The JAVAC "Make" variable is the javac packaged with the host JDK, which is not necessarily the same version used to compile java_library rules. Users should typically use java_library directly. If a manual javac invocation is required, BazelJavac uses the same javac version and flags as java_library. In the rare cases where the host JDK's compiler is actually desired, prefer `$(JAVABASE)/bin/javac` to `$(JAVAC)` for clarity. -- MOS_MIGRATED_REVID=113386241 --- .../build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools') diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index 709557ab8f..e83651cff0 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -831,10 +831,10 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { @Test public void testDefinedMakeVariable() throws Exception { SkylarkRuleContext ctx = createRuleContext("//foo:baz"); - String javac = (String) evalRuleContextCode(ctx, "ruleContext.var['JAVAC']"); + String java = (String) evalRuleContextCode(ctx, "ruleContext.var['JAVA']"); // Get the last path segment - javac = javac.substring(javac.lastIndexOf('/')); - assertEquals("/javac", javac); + java = java.substring(java.lastIndexOf('/')); + assertEquals("/java", java); } @Test -- cgit v1.2.3