commit 856b4dd190779ded5c2976f9b35fcc79606cc0d7
author John Cater <jcater@google.com> Tue Nov 21 08:06:16 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Nov 21 08:07:39 2017 -0800
tree 9abd8d9792c8f038b82661ac13b9a639ab9521cb
parent 2ed3261931ac7282fa926cf54a70ed41df853a62

Added new RuleClass flag to turn off platform support, to stop dependency cycles when loading platforms.

Part of #4128.

Change-Id: Ie55a91aaaec15d8eb537f59131fc2e69a8f9c251
PiperOrigin-RevId: 176509311

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 5f078d7..743625d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -486,6 +486,7 @@
 
     private final Map<String, Attribute> attributes = new LinkedHashMap<>();
     private final Set<Label> requiredToolchains = new HashSet<>();
+    private boolean supportsPlatforms = true;
 
     /**
      * Constructs a new {@code RuleClassBuilder} using all attributes from all
@@ -517,6 +518,7 @@
         supportsConstraintChecking = parent.supportsConstraintChecking;
 
         addRequiredToolchains(parent.getRequiredToolchains());
+        supportsPlatforms = parent.supportsPlatforms;
 
         for (Attribute attribute : parent.getAttributes()) {
           String attrName = attribute.getName();
@@ -599,6 +601,7 @@
           configurationFragmentPolicy.build(),
           supportsConstraintChecking,
           requiredToolchains,
+          supportsPlatforms,
           attributes.values().toArray(new Attribute[0]));
     }
 
@@ -1010,6 +1013,11 @@
       return this;
     }
 
+    public Builder supportsPlatforms(boolean flag) {
+      this.supportsPlatforms = flag;
+      return this;
+    }
+
     /**
      * Returns an Attribute.Builder object which contains a replica of the
      * same attribute in the parent rule if exists.
@@ -1132,6 +1140,7 @@
   private final boolean supportsConstraintChecking;
 
   private final ImmutableSet<Label> requiredToolchains;
+  private final boolean supportsPlatforms;
 
   /**
    * Constructs an instance of RuleClass whose name is 'name', attributes are 'attributes'. The
@@ -1181,6 +1190,7 @@
       ConfigurationFragmentPolicy configurationFragmentPolicy,
       boolean supportsConstraintChecking,
       Set<Label> requiredToolchains,
+      boolean supportsPlatforms,
       Attribute... attributes) {
     this.name = name;
     this.key = key;
@@ -1211,6 +1221,7 @@
     this.configurationFragmentPolicy = configurationFragmentPolicy;
     this.supportsConstraintChecking = supportsConstraintChecking;
     this.requiredToolchains = ImmutableSet.copyOf(requiredToolchains);
+    this.supportsPlatforms = supportsPlatforms;
 
     // Create the index and collect non-configurable attributes.
     int index = 0;
@@ -2031,6 +2042,10 @@
     return requiredToolchains;
   }
 
+  public boolean supportsPlatforms() {
+    return supportsPlatforms;
+  }
+
   public static boolean isThirdPartyPackage(PackageIdentifier packageIdentifier) {
     if (!packageIdentifier.getRepository().isMain()) {
       return false;