diff options
| author |  lberki <lberki@google.com> | 2017-09-04 17:40:32 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-04 18:24:47 +0200 |
| commit | b54c9adbb9a31e5af4b4627e4179407cb54084c0 (patch) | |
| tree | 5cf09883a9d320ea84e2a64fcb924bc06cecbebb /src/main/java/com/google/devtools/build/lib/analysis | |
| parent | b0b8bad00f163a3fa89e813f36fcaffac521eaad (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java index 3392aff327..e4e2c63eac 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java @@ -54,7 +54,7 @@ public class ConfigurationMakeVariableContext implements MakeVariableExpander.Co ImmutableMap<String, String> ruleMakeVariables, Package pkg, BuildConfiguration configuration) { - this(ruleMakeVariables, pkg, configuration, ImmutableList.<MakeVariableSupplier>of()); + this(ruleMakeVariables, pkg, configuration, ImmutableList.of()); } public ConfigurationMakeVariableContext( |