Prevent blaze from crashing on invalid resource locations.

RELNOTES: None PiperOrigin-RevId: 176659616
bazelbuild · Nov 22, 2017 · 69cb005 · 69cb005
1 parent 3948159
commit 69cb005
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/LocalResourceContainer.java b/src/main/java/com/google/devtools/build/lib/rules/android/LocalResourceContainer.java
@@ -286,9 +286,20 @@ private static PathFragment addResourceDir(
     PathFragment packageFragment =
         file.getArtifactOwner().getLabel().getPackageIdentifier().getSourceRoot();
     PathFragment packageRelativePath = file.getRootRelativePath().relativeTo(packageFragment);
-    resourceRoots.add(
-        trimTail(file.getExecPath(), makeRelativeTo(resourceDir, packageRelativePath)));
-
+    try {
+      resourceRoots.add(
+          trimTail(file.getExecPath(), makeRelativeTo(resourceDir, packageRelativePath)));
+    } catch (IllegalArgumentException e) {
+      ruleErrorConsumer.attributeError(
+          resourcesAttr,
+          String.format(
+              "'%s' (generated by '%s') is not under the directory '%s' (derived from %s).",
+              file.getRootRelativePath(),
+              file.getArtifactOwner().getLabel(),
+              packageRelativePath,
+              file.getRootRelativePath()));
+      throw new RuleErrorException();
+    }
     return resourceDir;
   }