Make error messages about illegal dependencies involving aliases clearer.

RELNOTES: None.
PiperOrigin-RevId: 190759949

2 files changed, 5 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
index 4784acaed6..6bc52b5315 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
@@ -78,7 +78,7 @@ public class AliasTest extends BuildViewTestCase {
     reporter.removeHandler(failFastHandler);
     getConfiguredTarget("//c:c");
     assertContainsEvent(
-        "Target '//a:a' (aliased through '//b:b') is not visible from target '//c:c'");
+        "alias '//b:b' referring to target '//a:a' is not visible from target '//c:c'");
   }
 
   @Test
@@ -94,8 +94,8 @@ public class AliasTest extends BuildViewTestCase {
 
     reporter.removeHandler(failFastHandler);
     getConfiguredTarget("//d:d");
-    assertContainsEvent(
-        "Target '//a:a' (aliased through '//c:c' -> '//b:b') is not visible from target '//d:d'");
+    assertContainsEvent("alias '//c:c' referring to target '//a:a' through '//b:b' "
+        + "is not visible from target '//d:d'");
   }
 
   @Test
@@ -131,7 +131,7 @@ public class AliasTest extends BuildViewTestCase {
 
     reporter.removeHandler(failFastHandler);
     getConfiguredTarget("//a:a");
-    assertContainsEvent("filegroup rule '//a:c' (aliased through '//a:b') is misplaced here");
+    assertContainsEvent("alias '//a:b' referring to filegroup rule '//a:c' is misplaced here");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
index 8c36bdde81..bb33ecb654 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
@@ -74,7 +74,7 @@ public class AndroidCommonTest extends BuildViewTestCase {
         "'//java/srcs:gvalid' is misplaced " + descriptionPlural,
         "'//java/srcs:gmix' does not produce any " + descriptionPlural);
     assertSrcsValidity(rule, "//java/srcs:invalid", true,
-        "file '//java/srcs:a.properties' is misplaced here " + descriptionPluralFile,
+        "source file '//java/srcs:a.properties' is misplaced here " + descriptionPluralFile,
         "'//java/srcs:ginvalid' does not produce any " + descriptionPlural);
     assertSrcsValidity(rule, "//java/srcs:mix", true,
         "'//java/srcs:a.properties' does not produce any " + descriptionPlural);