commit 7d1591f76bb438bfc8ee43fbf6254b260d659f52
author Ian Zerny <zerny@google.com> Wed Jan 03 12:38:07 2018 +0100
committer Ian Zerny <zerny@google.com> Wed Jan 03 12:38:07 2018 +0100
tree 22f790ddf77c98d8f505e8ea7a058df3edeedfbe
parent 923a0c11c1129c954a96b3fcbe2bfc163cbda78c

Add D8 main-dex-list API tests and update collection types.

Change-Id: I17103e98ab58d473b5dec03ba290a7247877d33c

src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java

diff --git a/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java b/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
index dff6ca9..be7e207 100644
--- a/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
+++ b/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
@@ -164,7 +164,10 @@
   }
 
   private static void useMainDexListFiles(
-      int minApiLevel, List<Path> libraries, List<Path> inputs, List<Path> mainDexList) {
+      int minApiLevel,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexList) {
     try {
       R8.run(
           R8Command.builder(handler)
@@ -180,7 +183,10 @@
   }
 
   private static void useMainDexClasses(
-      int minApiLevel, List<Path> libraries, List<Path> inputs, List<Path> mainDexList) {
+      int minApiLevel,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexList) {
     try {
       List<String> mainDexClasses = new ArrayList<>(1);
       for (Path path : mainDexList) {
@@ -208,7 +214,10 @@
   }
 
   private static void useMainDexRulesFiles(
-      int minApiLevel, List<Path> libraries, List<Path> inputs, List<Path> mainDexRules) {
+      int minApiLevel,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexRules) {
     try {
       R8.run(
           R8Command.builder(handler)
@@ -224,7 +233,10 @@
   }
 
   private static void useMainDexRules(
-      int minApiLevel, List<Path> libraries, List<Path> inputs, List<Path> mainDexRulesFiles) {
+      int minApiLevel,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexRulesFiles) {
     try {
       R8Command.Builder builder =
           R8Command.builder(handler)
@@ -246,9 +258,9 @@
 
   private static void useProguardConfigFiles(
       int minApiLevel,
-      List<Path> libraries,
-      List<Path> inputs,
-      List<Path> mainDexList,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexList,
       List<Path> pgConf) {
     try {
       R8.run(
@@ -267,9 +279,9 @@
 
   private static void useProguardConfigLines(
       int minApiLevel,
-      List<Path> libraries,
-      List<Path> inputs,
-      List<Path> mainDexList,
+      Collection<Path> libraries,
+      Collection<Path> inputs,
+      Collection<Path> mainDexList,
       List<Path> pgConf) {
     try {
       R8Command.Builder builder =