Update android_ide_common to 25.0.0 and clean up FolderConfigs

Older android_ide_common does not handle BCP 47,
so we update the code to handle that and remove
most of the workarounds. This also pulls in a
fix for 3-letter locales, unblocks resource
shrinking whitelisting, etc.

--
MOS_MIGRATED_REVID=135396457

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index 3a56088a4b..2470a3f87b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -85,7 +85,8 @@ public class ParsedAndroidData {
     private void checkForErrors() throws MergingException {
       if (!errors.isEmpty()) {
         MergingException mergingException =
-            new MergingException(String.format("%s Parse Error(s)", errors.size()));
+             MergingException
+                 .withMessage(String.format("%s Parse Error(s)", errors.size())).build();
         for (Exception e : errors) {
           mergingException.addSuppressed(e);
         }
@@ -271,7 +272,8 @@ public class ParsedAndroidData {
     @Override
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
         throws IOException {
-      final String[] dirNameAndQualifiers = dir.getFileName().toString().split("-");
+      final String[] dirNameAndQualifiers = dir.getFileName().toString().split(
+          SdkConstants.RES_QUALIFIER_SEP);
       folderType = ResourceFolderType.getTypeByName(dirNameAndQualifiers[0]);
       if (folderType == null) {
         return FileVisitResult.CONTINUE;