From 33fc33ff64b754674c6a6701824fb68ae3bc24f2 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Tue, 31 Oct 2017 11:12:14 -0400
Subject: Clean up LocalResourceContainer.Builder

LocalResourceContainer.Builder is referenced a bunch of times, but most of
those calls are identical. Replace them with a couple of factory methods. This
lets us make the builder private.

Additionally, LocalResourceContainer called attributeError() on the 'resources'
attribute, even though 'resource_files' is now used most of the time instead.
Now, the error is always given for the correct attribute.

RELNOTES: none
PiperOrigin-RevId: 174038035
---
 .../build/lib/rules/android/LocalResourceContainerTest.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java
index 6f397bf5fb..302ff4afdc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java
@@ -51,7 +51,7 @@ public class LocalResourceContainerTest extends ResourceTestBase {
     }
 
     errorConsumer.assertAttributeError(
-        "resources", "is not in the expected resource directory structure");
+        "resource_files", "is not in the expected resource directory structure");
   }
 
   @Test
@@ -64,7 +64,7 @@ public class LocalResourceContainerTest extends ResourceTestBase {
     }
 
     errorConsumer.assertAttributeError(
-        "resources", "All resources must share a common directory");
+        "resource_files", "All resources must share a common directory");
   }
 
   @Test
@@ -86,7 +86,7 @@ public class LocalResourceContainerTest extends ResourceTestBase {
 
   private ImmutableList<PathFragment> getResourceRoots(ImmutableList<Artifact> artifacts)
       throws Exception {
-    return LocalResourceContainer.getResourceRoots(errorConsumer, artifacts);
+    return LocalResourceContainer.getResourceRoots(errorConsumer, artifacts, "resource_files");
   }
 
   @Test
-- 
cgit v1.2.3