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, 21 insertions, 8 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
index 34334509bf..f1db567bb0 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.android;
 
 import com.android.SdkConstants;
 import com.android.annotations.NonNull;
-import com.android.ide.common.internal.LoggedErrorException;
 import com.android.ide.common.internal.PngCruncher;
+import com.android.ide.common.internal.PngException;
 import com.android.ide.common.res2.MergingException;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
@@ -70,9 +70,9 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
     public Boolean call() throws Exception {
       try {
         Files.createDirectories(destinationPath.getParent());
-        cruncher.crunchPng(source.toFile(), destinationPath.toFile());
-      } catch (InterruptedException | LoggedErrorException e) {
-        throw new MergingException(e);
+        cruncher.crunchPng(0, source.toFile(), destinationPath.toFile());
+      } catch (PngException e) {
+        throw MergingException.wrapException(e).build();
       }
       return Boolean.TRUE;
     }
@@ -105,10 +105,23 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
   private static final PngCruncher NOOP_CRUNCHER =
       new PngCruncher() {
         @Override
-        public void crunchPng(@NonNull File source, @NonNull File destination)
-            throws InterruptedException, LoggedErrorException, IOException {
-          Files.createDirectories(destination.toPath().getParent());
-          Files.copy(source.toPath(), destination.toPath());
+        public int start() {
+          return 0;
+        }
+
+        @Override
+        public void end(int key) throws InterruptedException {
+        }
+
+        @Override
+        public void crunchPng(int key, @NonNull File source, @NonNull File destination)
+            throws PngException {
+          try {
+            Files.createDirectories(destination.toPath().getParent());
+            Files.copy(source.toPath(), destination.toPath());
+          } catch (IOException e) {
+            throw new PngException(e);
+          }
         }
       };