From bc704360a93ff65c4d3684ab5cc0e45bd403bdd8 Mon Sep 17 00:00:00 2001 From: lberki Date: Thu, 11 Jan 2018 01:22:24 -0800 Subject: Remove the unused --[no]experimental_disable_jvm command line option. RELNOTES: The --[no]experimental_disable_jvm command line option is not supported anymore. PiperOrigin-RevId: 181575259 --- .../devtools/build/lib/rules/java/JavaOptions.java | 9 --------- .../lib/rules/java/JvmConfigurationLoader.java | 12 ++---------- .../devtools/build/lib/analysis/BuildViewTest.java | 22 ---------------------- .../lib/rules/android/AndroidDataBindingTest.java | 7 ------- .../lib/rules/objc/AppleStaticLibraryTest.java | 3 --- .../rules/objc/AppleToolchainSelectionTest.java | 6 +----- 6 files changed, 3 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java index 8c030ce55b..e9c6fb2bb1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java @@ -431,15 +431,6 @@ public class JavaOptions extends FragmentOptions { ) public List checkedConstraints; - @Option( - name = "experimental_disable_jvm", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = "Disables the Jvm configuration entirely." - ) - public boolean disableJvm; - @Option( name = "java_optimization_mode", defaultValue = "legacy", diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java index acf6576ca8..c9420ed0b4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.config.FragmentOptions; -import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; /** * A provider to load jvm configurations from the package path. @@ -32,15 +31,8 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationExcepti */ public final class JvmConfigurationLoader implements ConfigurationFragmentFactory { @Override - public Jvm create(ConfigurationEnvironment env, BuildOptions buildOptions) - throws InvalidConfigurationException, InterruptedException { - JavaOptions javaOptions = buildOptions.get(JavaOptions.class); - if (javaOptions.disableJvm) { - // TODO(bazel-team): Instead of returning null here, add another method to the interface. - return null; - } - - return new Jvm(javaOptions.javaBase); + public Jvm create(ConfigurationEnvironment env, BuildOptions buildOptions) { + return new Jvm(buildOptions.get(JavaOptions.class).javaBase); } @Override diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 933cf95d78..6646529869 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -1281,28 +1281,6 @@ public class BuildViewTest extends BuildViewTestBase { .containsExactly(ruleClassProvider.getUniversalFragment()); } - @Test - public void errorOnMissingDepFragments() throws Exception { - scratch.file("foo/BUILD", - "cc_library(", - " name = 'ccbin', ", - " srcs = ['c.cc'],", - " data = [':javalib'])", - "java_library(", - " name = 'javalib',", - " srcs = ['javalib.java'])"); - useConfiguration("--experimental_dynamic_configs=on", "--experimental_disable_jvm"); - reporter.removeHandler(failFastHandler); - try { - update("//foo:ccbin"); - fail(); - } catch (ViewCreationFailedException e) { - // Expected. - } - assertContainsEvent("//foo:ccbin: dependency //foo:javalib from attribute \"data\" is missing " - + "required config fragments: Jvm"); - } - /** * Here, injecting_rule injects an aspect which acts on a action_rule() and registers an action. * The action_rule() registers another action of its own. diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java index 9fb2cbcc1e..e50718107a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java @@ -286,11 +286,4 @@ public class AndroidDataBindingTest extends AndroidBuildViewTestCase { "package android.binary; public class MyApp {};"); assertThat(getConfiguredTarget("//java/android/binary:app")).isNotNull(); } - - @Test - public void testNoJvmFragment() throws Exception { - writeDataBindingFiles(); - useConfiguration("--experimental_disable_jvm"); - assertThat(getConfiguredTarget("//java/android/binary:app")).isNotNull(); - } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java index d4e455c3a2..389e34a96d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java @@ -211,7 +211,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { useConfiguration( "--ios_multi_cpus=i386,x86_64", - "--experimental_disable_jvm", "--crosstool_top=//tools/osx/crosstool:crosstool"); CommandAction action = (CommandAction) lipoLibAction("//package:test"); @@ -536,7 +535,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { "objc_library(name = 'objcLib', srcs = [ 'b.m' ], deps = [':avoidLib'])", "objc_library(name = 'avoidLib', srcs = [ 'c.m' ])"); - useConfiguration("--experimental_disable_jvm"); CommandAction action = linkLibAction("//package:test"); assertThat(Artifact.toRootRelativePaths(action.getInputs())).contains( "package/libobjcLib.a"); @@ -559,7 +557,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { "objc_library(name = 'objcLib', srcs = [ 'b.m' ])", "objc_library(name = 'avoidLib', srcs = [ 'c.m' ])"); - useConfiguration("--experimental_disable_jvm"); CommandAction action = linkLibAction("//package:test"); assertThat(Artifact.toRootRelativePaths(action.getInputs())).contains( "package/libobjcLib.a"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java index 663d31a609..87f86666aa 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java @@ -60,7 +60,6 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase { @Test public void testToolchainSelectionCcDepDefault() throws Exception { - useConfiguration("--experimental_disable_jvm"); ScratchAttributeWriter .fromLabelString(this, "cc_library", "//b:lib") .setList("srcs", "b.cc") @@ -107,9 +106,7 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase { @Test public void testToolchainSelectionMultiArchIos() throws Exception { - useConfiguration( - "--experimental_disable_jvm", - "--ios_multi_cpus=armv7,arm64"); + useConfiguration("--ios_multi_cpus=armv7,arm64"); ScratchAttributeWriter .fromLabelString(this, "cc_library", "//b:lib") .setList("srcs", "a.cc") @@ -133,7 +130,6 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase { @Test public void testToolchainSelectionMultiArchWatchos() throws Exception { useConfiguration( - "--experimental_disable_jvm", "--ios_multi_cpus=armv7,arm64", "--watchos_cpus=armv7k"); ScratchAttributeWriter -- cgit v1.2.3