From 6590914692db2c4ee7d582d90b28dd1b11bfaa79 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Mon, 19 Mar 2018 13:03:17 -0700 Subject: RELNOTES[INC]: Remove //tools/defaults:android_jar. Use @bazel_tools//tools/android:android_jar instead. Bazel 0.11 release notes mentioned deprecating //tools/android:android_jar, and Bazel 0.12 has already been cut. So I think Bazel 0.13 is a reasonable time to remove it. Also, delete the machines for configuration fragments adding rules (not labels) to the //tools/defaults package. //tools/defaults:android_jar was the only user. PiperOrigin-RevId: 189628217 --- .../google/devtools/build/lib/analysis/config/DefaultsPackage.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java index 0fb405519e..e53dc0e5ce 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.analysis.config; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.cmdline.Label; @@ -83,11 +82,9 @@ public final class DefaultsPackage { * The map from entries to their values. */ private ImmutableMap> values; - private ImmutableList rules; private DefaultsPackage(BuildOptions buildOptions) { values = buildOptions.getDefaultsLabels(); - rules = buildOptions.getDefaultsRules(); } private String labelsToString(Set