Remove support for --experimental_one_version_enforcement_use_transitive_jars_for_binary_under_test
@@ -841,7 +841,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
)
public boolean checkForMigrationTag;
- // TODO(eaftan): enable this by default and delete it
+ // TODO(eaftan): this is enabled by default, delete it after the next blaze release and removing
+ // from the global blazerc
@Option(
name = "experimental_one_version_enforcement_use_transitive_jars_for_binary_under_test",
defaultValue = "false",
@@ -850,10 +851,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION,
OptionEffectTag.ACTION_COMMAND_LINES
},
- help =
- "If enabled, one version enforcement for android_test uses the binary_under_test's "
- + "transitive classpath, otherwise it uses the deploy jar"
- )
+ help = "No-op. Kept here for backwards compatibility.")
public boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
@Override
@@ -878,8 +876,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
host.manifestMerger = manifestMerger;
host.androidAaptVersion = androidAaptVersion;
host.allowAndroidLibraryDepsWithoutSrcs = allowAndroidLibraryDepsWithoutSrcs;
- host.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
- oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
return host;
}
}
@@ -938,7 +934,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
private final AndroidRobolectricTestDeprecationLevel robolectricTestDeprecationLevel;
private final boolean decoupleDataProcessing;
private final boolean checkForMigrationTag;
- private final boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
AndroidConfiguration(Options options) throws InvalidConfigurationException {
this.enableAndroidCpuMakeVariable = options.enableAndroidCpuMakeVariable;
@@ -979,8 +974,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
this.robolectricTestDeprecationLevel = options.robolectricTestDeprecationLevel;
this.decoupleDataProcessing = options.decoupleDataProcessing;
this.checkForMigrationTag = options.checkForMigrationTag;
- this.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
- options.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
if (incrementalDexingShardsAfterProguard < 0) {
throw new InvalidConfigurationException(
@@ -1033,8 +1026,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
boolean fixedResourceNeverlinking,
AndroidRobolectricTestDeprecationLevel robolectricTestDeprecationLevel,
boolean decoupleDataProcessing,
- boolean checkForMigrationTag,
- boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest) {
+ boolean checkForMigrationTag) {
this.enableAndroidCpuMakeVariable = enableAndroidCpuMakeVariable;
this.sdk = sdk;
this.cpu = cpu;
@@ -1070,8 +1062,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
this.robolectricTestDeprecationLevel = robolectricTestDeprecationLevel;
this.decoupleDataProcessing = decoupleDataProcessing;
this.checkForMigrationTag = checkForMigrationTag;
- this.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
- oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
}
public String getCpu() {
@@ -1227,10 +1217,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
return checkForMigrationTag;
}
- public boolean getOneVersionEnforcementUseTransitiveJarsForBinaryUnderTest() {
- return oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
- }
-
@Override
public void addGlobalMakeVariables(ImmutableMap.Builder<String, String> globalMakeEnvBuilder) {
if (!enableAndroidCpuMakeVariable) {
