Remove the deprecated D8 API.
This change removes the deprecated parts of the D8 API and moves OutputMode
out of utils (which breaks both the old and new API). All clients will need
to be updated as part of updating to the D8 API after this change lands.
Change-Id: I73236b538eee540c490b375ea3333b06697b5f19
diff --git a/src/test/apiUsageSample/com/android/tools/apiusagesample/CachingArchiveClassFileProvider.java b/src/test/apiUsageSample/com/android/tools/apiusagesample/CachingArchiveClassFileProvider.java
index 859876d..775a308 100644
--- a/src/test/apiUsageSample/com/android/tools/apiusagesample/CachingArchiveClassFileProvider.java
+++ b/src/test/apiUsageSample/com/android/tools/apiusagesample/CachingArchiveClassFileProvider.java
@@ -6,8 +6,8 @@
import com.android.tools.r8.ArchiveClassFileProvider;
import com.android.tools.r8.ClassFileResourceProvider;
-import com.android.tools.r8.Resource;
-import com.android.tools.r8.utils.DirectoryClassFileProvider;
+import com.android.tools.r8.DirectoryClassFileProvider;
+import com.android.tools.r8.ProgramResource;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
@@ -16,15 +16,15 @@
public class CachingArchiveClassFileProvider extends ArchiveClassFileProvider {
- private ConcurrentHashMap<String, Resource> resources = new ConcurrentHashMap<>();
+ private ConcurrentHashMap<String, ProgramResource> resources = new ConcurrentHashMap<>();
private CachingArchiveClassFileProvider(Path archive) throws IOException {
super(archive);
}
@Override
- public Resource getResource(String descriptor) {
- return resources.computeIfAbsent(descriptor, desc -> super.getResource(desc));
+ public ProgramResource getProgramResource(String descriptor) {
+ return resources.computeIfAbsent(descriptor, super::getProgramResource);
}
public static ClassFileResourceProvider getProvider(Path entry)
