Internal change

PiperOrigin-RevId: 738870021

Author: houshian

src/java/com/google/devtools/common/util/concurrent/BUILD

@@ -57,6 +57,15 @@ java_library(
     ],
 )
 
+java_library(
+    name = "external_service_manager",
+    srcs = ["ExternalServiceManager.java"],
+    deps = [
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_jsr330_api",
+    ],
+)
+
 java_library(
     name = "mobile_harness_callable",
     srcs = ["MobileHarnessCallable.java"],
@@ -75,6 +84,19 @@ java_library(
     ],
 )
 
+java_library(
+    name = "service_module",
+    srcs = ["ServiceModule.java"],
+    deps = [
+        ":external_service_manager",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_jsr330_api",
+    ],
+)
+
 java_library(
     name = "thread_factory_util",
     srcs = ["ThreadFactoryUtil.java"],

src/java/com/google/devtools/mobileharness/shared/util/concurrent/BUILD

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.common.util.concurrent;
+package com.google.devtools.mobileharness.shared.util.concurrent;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

…l/concurrent/ExternalServiceManager.java …l/concurrent/ExternalServiceManager.javasrc/java/com/google/devtools/common/util/concurrent/ExternalServiceManager.java renamed to src/java/com/google/devtools/mobileharness/shared/util/concurrent/ExternalServiceManager.java src/java/com/google/devtools/common/util/concurrent/ExternalServiceManager.java renamed to src/java/com/google/devtools/mobileharness/shared/util/concurrent/ExternalServiceManager.java

@@ -28,7 +28,7 @@
  * the License.
  */
 
-package com.google.devtools.common.util.concurrent;
+package com.google.devtools.mobileharness.shared.util.concurrent;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -38,6 +38,7 @@
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import com.google.common.util.concurrent.ServiceManager;
 import com.google.common.util.concurrent.ServiceManager.Listener;

…ommon/util/concurrent/ServiceModule.java …hared/util/concurrent/ServiceModule.javasrc/java/com/google/devtools/common/util/concurrent/ServiceModule.java renamed to src/java/com/google/devtools/mobileharness/shared/util/concurrent/ServiceModule.java src/java/com/google/devtools/common/util/concurrent/ServiceModule.java renamed to src/java/com/google/devtools/mobileharness/shared/util/concurrent/ServiceModule.java

@@ -25,9 +25,12 @@ java_library(
     name = "concurrent",
     srcs = glob(["*.java"]),
     deps = [
+        "//src/java/com/google/devtools/mobileharness/shared/util/concurrent:external_service_manager",
         "//src/java/com/google/devtools/mobileharness/shared/util/concurrent:more_futures",
+        "//src/java/com/google/devtools/mobileharness/shared/util/concurrent:service_module",
         "//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
         "@maven//:junit_junit",
     ],
 )

src/javatests/com/google/devtools/common/util/concurrent/BUILD

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.common.util.concurrent;
+package com.google.devtools.mobileharness.shared.util.concurrent;
 
 import com.google.common.util.concurrent.ServiceManager;
 import com.google.inject.Guice;