Update Bazel's android_device support to use new emulator paths.

Also, bundle snapshots.img in Bazel since it was removed from the SDK.

Part of the fix for bazelbuild#3504

Note that this will require an update to unified launcher at https://github.com/google/android-testing-support-library

RELNOTES: None
PiperOrigin-RevId: 169937694

src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt

@@ -20,32 +20,27 @@ alias(
 
 alias(
     name = "emulator_arm",
-    actual = "tools/emulator64-arm",
+    actual = "emulator/emulator64-arm",
 )
 
 alias(
     name = "emulator_x86",
-    actual = "tools/emulator64-x86",
+    actual = "emulator/emulator64-x86",
 )
 
 filegroup(
     name = "emulator_x86_bios",
-    srcs = glob(["tools/lib/pc-bios/*"]),
+    srcs = glob(["emulator/lib/pc-bios/*"]),
 )
 
 alias(
     name = "mksd",
-    actual = "tools/mksdcard",
-)
-
-alias(
-    name = "empty_snapshot_fs",
-    actual = "tools/lib/emulator/snapshots.img",
+    actual = "emulator/mksdcard",
 )
 
 filegroup(
     name = "emulator_shared_libs",
-    srcs = glob(["tools/lib64/**"]),
+    srcs = glob(["emulator/lib64/**"]),
 )
 
 filegroup(
@@ -56,8 +51,8 @@ filegroup(
 filegroup(
     name = "qemu2_x86",
     srcs = [
-        "tools/emulator",
-        "tools/qemu/linux-x86_64/qemu-system-i386",
+        "emulator/emulator",
+        "emulator/qemu/linux-x86_64/qemu-system-i386",
     ],
 )
 

tools/android/emulator/BUILD

@@ -11,5 +11,6 @@ filegroup(
         "BUILD.tools",
         "googletest.sh",
         "no_se_linux.properties",
+        "snapshots.img.zip",
     ],
 )

tools/android/emulator/BUILD.tools

@@ -22,9 +22,12 @@ alias(
     actual = "@androidsdk//:mksd",
 )
 
-alias(
+genrule(
     name = "empty_snapshot_fs",
-    actual = "@androidsdk//:empty_snapshot_fs",
+    srcs = ["snapshots.img.zip"],
+    outs = ["snapshots.img"],
+    tools = ["@bazel_tools//tools/zip:zipper"],
+    cmd = "$(location @bazel_tools//tools/zip:zipper) x $< -d $(@D)",
 )
 
 filegroup(