Keep module implementation provider looked up via name
Bug: b/304992619
Change-Id: Icb531c1e17d81540cfde123799277f4943a63401
diff --git a/src/main/java/com/android/tools/r8/threading/providers/blocking/ThreadingModuleBlockingProvider.java b/src/main/java/com/android/tools/r8/threading/providers/blocking/ThreadingModuleBlockingProvider.java
index 0c390ee..d5a0ccb 100644
--- a/src/main/java/com/android/tools/r8/threading/providers/blocking/ThreadingModuleBlockingProvider.java
+++ b/src/main/java/com/android/tools/r8/threading/providers/blocking/ThreadingModuleBlockingProvider.java
@@ -4,9 +4,11 @@
package com.android.tools.r8.threading.providers.blocking;
+import com.android.tools.r8.Keep;
import com.android.tools.r8.threading.ThreadingModule;
import com.android.tools.r8.threading.ThreadingModuleProvider;
+@Keep
public class ThreadingModuleBlockingProvider implements ThreadingModuleProvider {
@Override
diff --git a/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreaded.java b/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreaded.java
new file mode 100644
index 0000000..0e47c03
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreaded.java
@@ -0,0 +1,41 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.threading.providers.singlethreaded;
+
+import com.android.tools.r8.threading.ThreadingModule;
+import com.google.common.util.concurrent.Futures;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+public class ThreadingModuleSingleThreaded implements ThreadingModule {
+
+ @Override
+ public <T> Future<T> submit(Callable<T> task, ExecutorService executorService)
+ throws ExecutionException {
+ try {
+ T value = task.call();
+ return Futures.immediateFuture(value);
+ } catch (Exception e) {
+ throw new ExecutionException(e);
+ }
+ }
+
+ @Override
+ public <T> void awaitFutures(List<Future<T>> futures) throws ExecutionException {
+ assert allDone(futures);
+ }
+
+ private <T> boolean allDone(List<Future<T>> futures) {
+ for (Future<?> future : futures) {
+ if (!future.isDone()) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreadedProvider.java b/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreadedProvider.java
index 6174077..8044511 100644
--- a/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreadedProvider.java
+++ b/src/main/java/com/android/tools/r8/threading/providers/singlethreaded/ThreadingModuleSingleThreadedProvider.java
@@ -4,47 +4,15 @@
package com.android.tools.r8.threading.providers.singlethreaded;
+import com.android.tools.r8.Keep;
import com.android.tools.r8.threading.ThreadingModule;
import com.android.tools.r8.threading.ThreadingModuleProvider;
-import com.google.common.util.concurrent.Futures;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
+@Keep
public class ThreadingModuleSingleThreadedProvider implements ThreadingModuleProvider {
@Override
public ThreadingModule create() {
return new ThreadingModuleSingleThreaded();
}
-
- public static class ThreadingModuleSingleThreaded implements ThreadingModule {
-
- @Override
- public <T> Future<T> submit(Callable<T> task, ExecutorService executorService)
- throws ExecutionException {
- try {
- T value = task.call();
- return Futures.immediateFuture(value);
- } catch (Exception e) {
- throw new ExecutionException(e);
- }
- }
-
- @Override
- public <T> void awaitFutures(List<Future<T>> futures) throws ExecutionException {
- assert allDone(futures);
- }
-
- private <T> boolean allDone(List<Future<T>> futures) {
- for (Future<?> future : futures) {
- if (!future.isDone()) {
- return false;
- }
- }
- return true;
- }
- }
}
