commit b721736377e4e335c1e52b8bc96c9e07093a743d
author Googler <noreply@google.com> Wed May 29 15:43:19 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 29 15:44:25 2019 -0700
tree eb494030f22695cea854b81b85f45da3c58f59e0
parent fb53c9886dcb29c55903395eff5b7a8b7f245cf7

Add a helpful error message before a potential NPE.

RELNOTES: None
PiperOrigin-RevId: 250581763

src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
index 85e9826..4b451a2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
@@ -144,17 +144,23 @@
     public List<Path> call() throws Exception {
       final String directoryName = file.getParent().getFileName().toString();
       final Qualifiers qualifiers = Qualifiers.parseFrom(directoryName);
-      final String filename = interpolateAapt2Filename(qualifiers, file.getFileName().toString());
+      final ResourceFolderType resourceFolderType = qualifiers.asFolderType();
+      if (resourceFolderType == null) {
+        throw new CompileError(
+            new IllegalArgumentException("Unexpected resource folder for file: " + file));
+      }
 
+      final String filename =
+          interpolateAapt2Filename(resourceFolderType, file.getFileName().toString());
       final List<Path> results = new ArrayList<>();
-      if (qualifiers.asFolderType().equals(ResourceFolderType.VALUES)
-          || (qualifiers.asFolderType().equals(ResourceFolderType.RAW)
+      if (resourceFolderType.equals(ResourceFolderType.VALUES)
+          || (resourceFolderType.equals(ResourceFolderType.RAW)
               && file.getFileName().toString().endsWith(".xml"))) {
         extractAttributes(directoryName, filename, results);
       }
 
       if (qualifiers.containDefaultLocale()
-          && qualifiers.asFolderType().equals(ResourceFolderType.VALUES)) {
+          && resourceFolderType.equals(ResourceFolderType.VALUES)) {
         compile(
             directoryName,
             filename,
@@ -171,9 +177,9 @@
       return results;
     }
 
-    static String interpolateAapt2Filename(Qualifiers qualifiers, String filename) {
+    static String interpolateAapt2Filename(ResourceFolderType resourceFolderType, String filename) {
       // res/<not values>/foo.bar -> foo.bar
-      if (!qualifiers.asFolderType().equals(ResourceFolderType.VALUES)) {
+      if (!resourceFolderType.equals(ResourceFolderType.VALUES)) {
         return filename;
       }