Only load the whitelist for Android targets if they use feature flags.

Currently, every Android-related top-level target will use the feature
flag whitelist, regardless of whether it has any feature flags.
This change makes it so that these targets only load the whitelist if
they need it.

In the process, it moves the value of the whitelist from the attribute
definition method to outside of it. Because it's a builder, this is only
a minor change to each callsite.

RELNOTES: None.
PiperOrigin-RevId: 169405621

1 files changed, 1 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/whitelisting/Whitelist.java b/src/main/java/com/google/devtools/build/lib/analysis/whitelisting/Whitelist.java
index 8850f1a9ec..10e776a3be 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/whitelisting/Whitelist.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/whitelisting/Whitelist.java
@@ -44,13 +44,10 @@ public final class Whitelist {
    *
    * @param whitelistName The name of the whitelist. This has to comply with attribute naming
    *     standards and will be used as a suffix for the attribute name.
-   * @param packageGroupWhitelist Label for the package group with the whitelist.
    */
-  public static Attribute.Builder<Label> getAttributeFromWhitelistName(
-      String whitelistName, Label packageGroupWhitelist) {
+  public static Attribute.Builder<Label> getAttributeFromWhitelistName(String whitelistName) {
     String attributeName = getAttributeNameFromWhitelistName(whitelistName);
     return attr(attributeName, LABEL)
-        .value(packageGroupWhitelist)
         .cfg(HOST)
         .mandatoryNativeProviders(ImmutableList.of(PackageSpecificationProvider.class));
   }