Enhance AndroidResourceProcessingAction's split detection.

The --splits flag is now --split, since I remembered about how allowMultiple exists.
More importantly, split APKs are now correctly moved to filenames which are fairly
trivially constructed from the input split flags, allowing Bazel to just do a simple
one-character replace on the split flags and know what files the resource processing
action is going to output.

One more step in the quest for world domination, or rather, split APKs for resources.
Next: Actually supporting this in android_binary.

--
MOS_MIGRATED_REVID=126838431

1 files changed, 5 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 9bbef3dd24..17c4822cbe 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.android.Converters.DependencyAndroidDataListCon
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.Converters.UnvalidatedAndroidDataConverter;
 import com.google.devtools.build.android.Converters.VariantConfigurationTypeConverter;
+import com.google.devtools.build.android.SplitConfigurationFilter.UnrecognizedSplitsException;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionsBase;
@@ -340,7 +341,10 @@ public class AndroidResourceProcessingAction {
     } catch (MergingException e) {
       LOGGER.log(java.util.logging.Level.SEVERE, "Error during merging resources", e);
       throw e;
-    } catch (IOException | InterruptedException | LoggedErrorException e) {
+    } catch (IOException
+        | InterruptedException
+        | LoggedErrorException
+        | UnrecognizedSplitsException e) {
       LOGGER.log(java.util.logging.Level.SEVERE, "Error during processing resources", e);
       throw e;
     } catch (Exception e) {