commit ebfd3bcb0baec0774db584fd3ff5445a1ec7925b
author Jingwen Chen <jingwen@google.com> Fri Jun 14 13:45:01 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 14 13:45:58 2019 -0700
tree 876f8653c3efad008c7c110820415ea6d714de7e
parent 18d63a7af207214ec27e369614a6189f73b0a251

Update target labels for @androidsdk system images

Fixes https://github.com/bazelbuild/bazel/issues/8590

Closes #8641.

Change-Id: I3e1d7db3716d4845af316941135bacc763975255
PiperOrigin-RevId: 253288388

tools/android/android_sdk_repository_template.bzl

diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index 04e34e0..5c92c54 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -265,6 +265,7 @@
     )
 
 TAGDIR_TO_TAG_MAP = {
+    "google_apis_playstore": "playstore",
     "google_apis": "google",
     "default": "android",
     "android-tv": "tv",
@@ -292,20 +293,25 @@
     system_images = [
         (tag, str(api), arch)
         for tag in ["android", "google"]
-        for api in [10] + list(range(15, 20)) + list(range(21, 29))
+        for api in [10] + list(range(15, 20)) + list(range(21, 30))
         for arch in ("x86", "arm")
+    ] + [
+        ("playstore", str(api), "x86")
+        for api in list(range(24, 30))
     ]
     tv_images = [
-        ("tv", str(api), arch)
-        for api in range(21, 25)
-        for arch in ("x86", "arm")
+        ("tv", str(api), "x86")
+        for api in range(21, 30)
+    ] + [
+        ("tv", "21", "arm"),
+        ("tv", "23", "arm"),
     ]
     wear_images = [
         ("wear", str(api), "x86")
-        for api in range(20, 26)
+        for api in [23, 25, 26, 28]
     ] + [
         ("wear", str(api), "arm")
-        for api in range(24, 26)
+        for api in [23, 25]
     ]
     supported_system_images = system_images + tv_images + wear_images