Preparation for using the Starlark version of `AndroidInstrumentation…

…Info`. PiperOrigin-RevId: 665561460 Change-Id: I325c3291cf4f842109b64a0c491d20a3d11becfa
bazelbuild · Aug 20, 2024 · 7f54b1b · 7f54b1b
1 parent 05989d0
commit 7f54b1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/launcher/artifact.bzl b/launcher/artifact.bzl
@@ -13,8 +13,8 @@
 # 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("@rules_android//rules:rules.bzl", "AndroidAppsInfo")
+load("@rules_android//rules:providers.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")

diff --git a/launcher/launcher.bzl b/launcher/launcher.bzl
@@ -18,7 +18,8 @@
 # and then use a text_proto_test to validate it.
 
 load("//provider:provider.bzl", "utp_provider", "utp_provider_tools")
-load("//tools/build_defs/android:rules.bzl", "AndroidAppsInfo", "StarlarkApkInfo", "instrumented_app_info_aspect")
+load("@rules_android//rules:rules.bzl", "AndroidAppsInfo", "StarlarkApkInfo", "instrumented_app_info_aspect")
+load("@rules_android//rules:providers.bzl", "AndroidInstrumentationInfo")
 load(":artifact.bzl", "UTPArtifactInfo", "UTPArtifactsInfo", "apk_to_installable", "artifact_to_message", "data_to_dep", "file_to_dep")
 load(":entry_point.bzl", "UTPEntryPointInfo", "launcher_classpath")
 load(":environment.bzl", "EnvironmentInfo", "environment_to_message")

diff --git a/launcher/utilities.bzl b/launcher/utilities.bzl
@@ -14,7 +14,7 @@
 
 """Utility functions."""
 
-load("//tools/build_defs/android:rules.bzl", "StarlarkApkInfo")
+load("@rules_android//rules:rules.bzl", "StarlarkApkInfo")
 
 visibility([
     "//launcher/...",