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

5 files changed, 1 insertions, 39 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index 76ab7861d3..ddfdc560ea 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -170,15 +170,6 @@ public final class BuildOptions implements Cloneable, Serializable {
     return result.build();
   }
 
-  ImmutableList<String> getDefaultsRules() {
-    ImmutableList.Builder<String> result = ImmutableList.builder();
-    for (FragmentOptions fragment : fragmentOptionsMap.values()) {
-      result.addAll(fragment.getDefaultsRules());
-    }
-
-    return result.build();
-  }
-
   /**
    * Returns true if actions should be enabled for this configuration.
    */
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<String, ImmutableSet<Label>> values;
-  private ImmutableList<String> rules;
 
   private DefaultsPackage(BuildOptions buildOptions) {
     values = buildOptions.getDefaultsLabels();
-    rules = buildOptions.getDefaultsRules();
   }
 
   private String labelsToString(Set<Label> labels) {
@@ -115,10 +112,6 @@ public final class DefaultsPackage {
           .append(labelsToString(entry.getValue())).append("])\n");
     }
 
-    for (String rule : rules) {
-      result.append(rule).append("\n");
-    }
-
     return result.toString();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
index abf15c5081..9933b6fad3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.analysis.config;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.common.options.Options;
@@ -37,19 +36,6 @@ public abstract class FragmentOptions extends OptionsBase implements Cloneable,
   }
 
   /**
-   * Returns the extra rules contributed to the default package by this fragment.
-   *
-   * <p>The return value should be a list of strings, which are merged into the BUILD files of the
-   * defaults package.
-   *
-   * <p><strong>WARNING;</strong> this method should only be used when absolutely necessary. Always
-   * prefer {@code getDefaultsLabels()} to this.
-   */
-  public ImmutableList<String> getDefaultsRules() {
-    return ImmutableList.of();
-  }
-
-  /**
    * Returns true if actions should be enabled for this configuration. If <b>any</b> fragment
    * sets this to false, <i>all</i> actions are disabled for the configuration.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index e5a0ab7af6..fe404b2947 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -849,11 +849,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
       host.allowAndroidLibraryDepsWithoutSrcs = allowAndroidLibraryDepsWithoutSrcs;
       return host;
     }
-
-    @Override
-    public ImmutableList<String> getDefaultsRules() {
-      return ImmutableList.of("android_tools_defaults_jar(name = 'android_jar')");
-    }
   }
 
   /** Configuration loader for the Android fragment. */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidToolsDefaultsJar.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidToolsDefaultsJar.java
index 1afc07f214..0fee99fd6e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidToolsDefaultsJar.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidToolsDefaultsJar.java
@@ -29,10 +29,7 @@ import com.google.devtools.build.lib.collect.nestedset.Order;
  * <p>This rule is a sad, sad way to let people depend on {@code android.jar} when an {@code
  * android_sdk} rule is used. In an ideal world, people would say "depend on the android_jar output
  * group of $config.android_sdk", but, alas, neither depending on labels in the configuration nor
- * depending on a specified output group works.
- *
- * <p>So all this needs to be implemented manually. This rule is injected into the defaults package
- * from {@link AndroidConfiguration.Options#getDefaultsRules()}.
+ * depending on a specified output group works. So all this needs to be implemented manually.
  */
 public class AndroidToolsDefaultsJar implements RuleConfiguredTargetFactory {