commit 6e165f7b3de10a444e05b6958df511c1dba46eb7
author Ian Zerny <zerny@google.com> Mon Jun 22 11:27:13 2020 +0200
committer Ian Zerny <zerny@google.com> Mon Jun 22 09:33:00 2020 +0000
tree 5a3f529a73356b2ee840f7f595f87e0e072dcf25
parent 376b74c40f8670a92141abcd59374b70c0b1e71b

Copy non-public utility to the compile dump wrapper.

Change-Id: If5f3e2c1b9743c0a71d1ddc25469e43ba9387e79

src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java

diff --git a/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java b/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
index 38cd73e..936395f 100644
--- a/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
+++ b/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
@@ -3,8 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.utils;
 
-import static com.android.tools.r8.utils.FileUtils.isArchive;
-
 import com.android.tools.r8.CompatProguardCommandBuilder;
 import com.android.tools.r8.CompilationFailedException;
 import com.android.tools.r8.CompilationMode;
@@ -51,6 +49,14 @@
   private static final List<String> VALID_OPTIONS_WITH_TWO_OPERANDS =
       Arrays.asList("--feature-jar");
 
+  private static boolean FileUtils_isArchive(Path path) {
+    String name = path.getFileName().toString().toLowerCase();
+    return name.endsWith(".apk")
+        || name.endsWith(".jar")
+        || name.endsWith(".zip")
+        || name.endsWith(".aar");
+  }
+
   public static void main(String[] args) throws CompilationFailedException {
     boolean isCompatMode = false;
     OutputMode outputMode = OutputMode.DexIndexed;
@@ -134,7 +140,7 @@
             {
               Path featureIn = Paths.get(firstOperand);
               Path featureOut = Paths.get(secondOperand);
-              if (!isArchive(featureIn)) {
+              if (!FileUtils_isArchive(featureIn)) {
                 throw new IllegalArgumentException(
                     "Expected an archive, got `" + featureIn.toString() + "`.");
               }