diff options
| author |  lberki <lberki@google.com> | 2018-01-11 05:04:45 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-11 05:06:10 -0800 |
| commit | 84f2c42686763c81e1cfa75e021dccbc70f8572c (patch) | |
| tree | 5fab2286b9c535f1b1b0428bc0a28c514cbab78d /src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | |
| parent | 5fa8dbd9d536417cfe544114a2584dfef9785dd7 (diff) | |
Minor cleanup: move all code from JavaConfigurationLoader to the ctor of JavaConfiguration.
RELNOTES: None.
PiperOrigin-RevId: 181593727
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java index 7290f13c42..4e8d9ceac2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java @@ -176,8 +176,6 @@ public final class JavaConfiguration extends Fragment { private final boolean useLegacyBazelJavaTest; JavaConfiguration( - boolean generateJavaDeps, - List<String> defaultJvmFlags, JavaOptions javaOptions) throws InvalidConfigurationException { this.commandLineJavacFlags = @@ -186,9 +184,10 @@ public final class JavaConfiguration extends Fragment { this.useIjars = javaOptions.useIjars; this.useHeaderCompilation = javaOptions.headerCompilation; this.headerCompilationDisableJavacFallback = javaOptions.headerCompilationDisableJavacFallback; - this.generateJavaDeps = generateJavaDeps; + this.generateJavaDeps = + javaOptions.javaDeps || javaOptions.javaClasspath != JavaClasspathMode.OFF; this.javaClasspath = javaOptions.javaClasspath; - this.defaultJvmFlags = ImmutableList.copyOf(defaultJvmFlags); + this.defaultJvmFlags = ImmutableList.copyOf(javaOptions.jvmOpts); this.checkedConstraints = ImmutableList.copyOf(javaOptions.checkedConstraints); this.strictJavaDeps = javaOptions.strictJavaDeps; this.proguardBinary = javaOptions.proguard; |