Update target labels for system images
Fixes
Closes
@@ -265,6 +265,7 @@ def create_android_sdk_rules(
)
TAGDIR_TO_TAG_MAP = {
+ "google_apis_playstore": "playstore",
"google_apis": "google",
"default": "android",
"android-tv": "tv",
@@ -292,20 +293,25 @@ def create_system_images_filegroups(system_image_dirs):
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
