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, 2 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
index 933341238d..20b0e93c83 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import com.android.builder.core.VariantConfiguration;
+import com.android.builder.core.VariantType;
 import com.android.ide.common.res2.MergingException;
 import com.android.utils.StdLogger;
 import com.google.common.annotations.VisibleForTesting;
@@ -136,7 +136,7 @@ public class AarGeneratorAction {
               resourcesOut,
               assetsOut,
               null,
-              VariantConfiguration.Type.LIBRARY,
+              VariantType.LIBRARY,
               null);
       logger.fine(String.format("Merging finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));