Automated Code Change

PiperOrigin-RevId: 658259241
Change-Id: Ifb8979c9c63ed47421ddbc71e03fb252a8257246

Author: A Googler

launcher/BUILD

@@ -32,6 +32,8 @@ bzl_library(
         ":primitives",
         ":utilities",
         "//provider",
+        "//tools/build_defs/android:rules_bzl",
+        "//tools/build_defs/android/public_api:android_instrumentation_info_bzl",
     ],
 )
 
@@ -49,6 +51,7 @@ bzl_library(
     srcs = ["environment.bzl"],
     deps = [
         ":primitives",
+        "//tools/build_defs/android/public_api:android_sdk_info_bzl",
     ],
 )
 
@@ -82,9 +85,11 @@ bzl_library(
         ":environment",
         ":extension",
         ":features",
+        ":primitives",
         ":test_fixture",
         ":utilities",
         "//provider",
+        "//tools/build_defs/android/public_api:android_instrumentation_info_bzl",
         "@rules_android//rules:rules.bzl",
     ],
 )

launcher/artifact.bzl

@@ -11,10 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Generates Artifact messages to feed to other rules."""
 
 load("//tools/build_defs/android:rules.bzl", "AndroidAppsInfo")
+load("//tools/build_defs/android/public_api:android_instrumentation_info.bzl", "AndroidInstrumentationInfo")
 load(":mime_types.bzl", "get_mime_type")
 load(":primitives.bzl", "absolute_path_struct", "enum", "path_proto")
 load(":utilities.bzl", "any_textproto", "signed_apk")

launcher/environment.bzl

@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Configures the UTP test environment."""
 
+load("//tools/build_defs/android/public_api:android_sdk_info.bzl", "AndroidSdkInfo")
 load(
     ":primitives.bzl",
     "absolute_path_struct",

launcher/launcher.bzl

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """A UTP launcher that generates the RunnerConfig in Starlark."""
 
 # There appears to be no way in Starlark for a non-test step to have access to the environment