Make Make variables from genrule.toolchains override the usual synthetic host JAVA/JAVABASE attributes.

Also fix a few lint warnings and move a class so that it's closer to where it's actually used.

RELNOTES: None.
PiperOrigin-RevId: 167501208

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index 084b03325c..98ba0c223f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -102,9 +102,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
   @Test
   public void testDefinesAndMakeVariables() throws Exception {
     ConfiguredTarget l = scratchConfiguredTarget("a", "l",
-        "cc_library(name='l', srcs=['l.cc'], defines=['V=$(TEST_VARIABLE)'], toolchains=[':v'])",
-        "make_variable_tester(name='v')");
-    assertThat(l.getProvider(CppCompilationContext.class).getDefines()).contains("V=FOOBAR");
+        "cc_library(name='l', srcs=['l.cc'], defines=['V=$(FOO)'], toolchains=[':v'])",
+        "make_variable_tester(name='v', variables={'FOO': 'BAR'})");
+    assertThat(l.getProvider(CppCompilationContext.class).getDefines()).contains("V=BAR");
   }
 
   @Test