From 8d876cf3ac18a0563828f4d66a48b84c957c55fb Mon Sep 17 00:00:00 2001 From: ajmichael Date: Wed, 12 Apr 2017 01:34:08 +0000 Subject: Make android_sdk_repository generate filegroups containing system image files for all android system images installed in the SDK. For system images that are not installed, create genrule "poison pills" that print a helpful error message if you attempt to build them. These filegroups are intended to be used as the system_image attribute of the android_device rule. Example: $ bazel build @android_test_support//tools/android/emulated_devices/pixel:android_25_x86 Extracting Bazel installation... . INFO: Found 1 target... ERROR: /usr/local/google/home/ajmichael/.cache/bazel/_bazel_ajmichael/efa32264346ef1fc4fec492202b88b31/external/androidsdk/BUILD.bazel:56:1: Executing genrule @androidsdk//:emulator_images_android_25_x86 failed: Process exited with status 1 [sandboxed]. This rule requires that the Android SDK used by Bazel has the following system image installed: emulator_images_android_25_x86. Please install this system image through the Android SDK Manager and try again. RELNOTES: None PiperOrigin-RevId: 152889824 --- .../lib/bazel/rules/android/android_sdk_repository_template.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt index cab75e8baa..a2663c719c 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt @@ -2,8 +2,8 @@ package(default_visibility = ["//visibility:public"]) load( "@bazel_tools//tools/android:android_sdk_repository_template.bzl", - "create_android_device_rules", - "create_android_sdk_rules") + "create_android_sdk_rules", + "create_system_images_filegroups") create_android_sdk_rules( name = "%repository_name%", @@ -53,7 +53,7 @@ filegroup( srcs = ["."], ) -create_android_device_rules( +create_system_images_filegroups( system_image_dirs = [ %system_image_dirs% ], ) -- cgit v1.2.3