Always restrict aspects to only access requested configuration fragments.

This completes the introduction of aspect configuration fragment enforcement
for static configuration builds; as of this change, it is no longer possible to
fall back to the base rule's set of requested configuration fragments.

This sort of fallback may become possible later, likely in a more controlled way.

--
MOS_MIGRATED_REVID=122638152

2 files changed, 4 insertions, 20 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
index bdb273e15d..4bf2c55102 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
@@ -138,10 +138,10 @@ public class AspectDefinitionTest {
   }
 
   @Test
-  public void testNoConfigurationFragmentPolicySetup_ReturnsNull() throws Exception {
+  public void testNoConfigurationFragmentPolicySetup_HasNonNullPolicy() throws Exception {
     AspectDefinition noPolicy = new AspectDefinition.Builder("no_policy")
         .build();
-    assertThat(noPolicy.getConfigurationFragmentPolicy()).isNull();
+    assertThat(noPolicy.getConfigurationFragmentPolicy()).isNotNull();
   }
 
   @Test
@@ -205,12 +205,12 @@ public class AspectDefinitionTest {
   }
 
   @Test
-  public void testEmptySkylarkConfigurationFragmentPolicySetup_ReturnsNull() throws Exception {
+  public void testEmptySkylarkConfigurationFragmentPolicySetup_HasNonNullPolicy() throws Exception {
     AspectDefinition noPolicy = new AspectDefinition.Builder("no_policy")
         .requiresConfigurationFragmentsBySkylarkModuleName(ImmutableList.<String>of())
         .requiresHostConfigurationFragmentsBySkylarkModuleName(ImmutableList.<String>of())
         .build();
-    assertThat(noPolicy.getConfigurationFragmentPolicy()).isNull();
+    assertThat(noPolicy.getConfigurationFragmentPolicy()).isNotNull();
   }
 
   @SkylarkModule(name = "test_fragment", doc = "test fragment")
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
index 63c5d683aa..4e5d38582a 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
@@ -856,22 +856,6 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
             + "(for example: host_fragments = [\"cpp\"])");
   }
 
-  @Test
-  public void testAspectFragmentFallback() throws Exception {
-    // TODO(mstaib): Remove this test when rule fragment fallback is no longer permitted.
-    getConfiguredTargetForAspectFragment(
-        "ctx.fragments.cpp.compiler", "", "", "'cpp'", "");
-    assertNoEvents();
-  }
-
-  @Test
-  public void testAspectHostFragmentFallback() throws Exception {
-    // TODO(mstaib): Remove this test when rule fragment fallback is no longer permitted.
-    getConfiguredTargetForAspectFragment(
-        "ctx.host_fragments.cpp.compiler", "", "", "", "'cpp'");
-    assertNoEvents();
-  }
-
   private ConfiguredTarget getConfiguredTargetForAspectFragment(
       String fullFieldName,
       String fragments,