commit 21da72604c4729dead9d31dd80c923aa1962f3c9
author Googler <noreply@google.com> Sat Sep 19 00:29:50 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Sep 21 08:59:47 2015 +0000
tree 2399f3ad10705784f1b30c7c4f318720ee560637
parent dad0a10d4f13a5629097e9c8dcc29dc42bb686e6

Make sure disabled FDO features are filtered out.

Without this, the FDO features enabled under --fdo* blaze options are not removed when BUILD files contain "features = ['-fdo_instrument', '-fdo_optimize']".

--
MOS_MIGRATED_REVID=103431508

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 2f44210..479b0b5 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
@@ -1295,7 +1295,8 @@
     }
 
     String name = fragmentNameResolver.resolveName(configurationFragment);
-    return (name != null && requiredConfigurationFragmentNames.get(config).contains(name));
+    ImmutableSet<String> fragmentNames = requiredConfigurationFragmentNames.get(config);
+    return (name != null && fragmentNames != null && fragmentNames.contains(name));
   }
 
   /**